my_first_github_repository Here is my first github repository README.md file was just edited manually. This line was modified manually during conflict resolution New line was added locally