Resolving conflict with doc/user/project/issues/index.md

doc/user/project/issues/index.md

@@ -34,11 +34,7 @@ your project public, open to collaboration.
 
 ### Streamline collaboration
 
-<<<<<<< HEAD
 With [Multiple Assignees for Issues](multiple_assignees_for_issues.md),
-=======
-With [Multiple Assignees for Issues](https://docs.gitlab.com/ee/user/project/issues/multiple_assignees_for_issues.html),
->>>>>>> upstream/master
 available in [GitLab Starter](https://about.gitlab.com/products/)
 you can streamline collaboration and allow shared responsibilities to be clearly displayed.
 All assignees are shown across your workflows and receive notifications (as they
@@ -145,7 +141,6 @@ Find GitLab Issue Boards by navigating to your **Project's Dashboard** > **Issue
 Read through the documentation for [Issue Boards](../issue_board.md)
 to find out more about this feature.
 
-<<<<<<< HEAD
 ### Export Issues to CSV
 
 > Available in [GitLab Starter](https://about.gitlab.com/products/) and
@@ -165,10 +160,6 @@ and appear in a block below the issue description. Issues can be across groups
 and projects.
 
 Read more about [Related Issues](related_issues.md).
-=======
-With [GitLab Starter](https://about.gitlab.com/products/), you can also
-create various boards per project with [Multiple Issue Boards](https://docs.gitlab.com/ee/user/project/issue_board.html#multiple-issue-boards).
->>>>>>> upstream/master
 
 ### External Issue Tracker