Resolve doc/README.md

doc/README.md

@@ -95,11 +95,8 @@ Manage your [repositories](user/project/repository/index.md) from the UI (user i
 - [Discussions](user/discussions/index.md) Threads, comments, and resolvable discussions in issues, commits, and  merge requests.
 - [Issues](user/project/issues/index.md)
 - [Project issue Board](user/project/issue_board.md)
-<<<<<<< HEAD
 - **(EEP)** [Group issue boards](user/group/issue_boards.md)
 - **(EES/EEP)** [Related Issues](user/project/issues/related_issues.md): create a relationship between issues
-=======
->>>>>>> upstream/master
 - [Issues and merge requests templates](user/project/description_templates.md): Create templates for submitting new issues and merge requests.
 - [Labels](user/project/labels.md): Categorize your issues or merge requests based on descriptive titles.
 - [Merge Requests](user/project/merge_requests/index.md)