Update to readme.md

Author: PagelsR

learn-pr/github/manage-innersource-program-github/includes/2-manage-innersource-program.md

@@ -60,7 +60,7 @@ A README file communicates expectations for your project and helps you manage co
 - Include references to the projects on which you depend. These references are a good way to promote the work of others.
 - Use Markdown to guide readers through properly formatted content.
 
-If you put your README file in your repository's root directory, or in the hidden `.github` or `docs` directory, GitHub recognizes and automatically surfaces your README to repository visitors. If a repository contains more than one README file, then the file shown is chosen from locations in the following order: 
+If you put your README.md file in your repository's root directory, or in the hidden `.github` or `docs` directory, GitHub recognizes and automatically surfaces your README to repository visitors. If a repository contains more than one README file, then the file shown is chosen from locations in the following order: 
 1. The `.github` directory  
 2. The repository's root directory  
 3. The `docs` directory  

learn-pr/github/search-organize-repository-history-github/includes/2-search-organize-repository-history-github.md

@@ -72,11 +72,7 @@ Milestones let you group issues and pull requests into shared goals, like a spri
 2. In the right sidebar, select Milestone.
 3. Choose from the list of available milestones.
 
-<<<<<<< HEAD
 You can also add milestones as a column to your GitHub Projects layout or display a milestone as a card on a GitHub Projects board. This helps visualize and manage your team’s progress directly from your project planning board.
-=======
-When you view a milestone, GitHub shows how many issues/PRs are complete and how many remain. This makes it a helpful lightweight planning and tracking tool. For more advanced project management, use GitHub Projects.
->>>>>>> 819b32c64b747d600d06081b99b95d322816026f
 
 > You can filter by milestone in GitHub Projects or with advanced search queries like:
 >