Resolve conflict in doc/user/project/merge_requests/index.md

Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8478

doc/user/project/merge_requests/index.md

@@ -150,7 +150,15 @@ you hide discussions that are no longer relevant.
 
 [Read more about resolving discussion comments in merge requests reviews.](../../discussions/index.md)
 
-<<<<<<< HEAD
+## Commenting on any file line in merge requests
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/13950) in GitLab 11.5.
+
+GitLab provides a way of leaving comments in any part of the file being changed
+in a Merge Request. To do so, click the **...** button in the gutter of the Merge Request diff UI to expand the diff lines and leave a comment, just as you would for a changed line.
+
+![Comment on any diff file line](img/comment-on-any-diff-line.png)
+
 ## Perform a Review **[PREMIUM]**
 
 Start a review in order to create multiple comments on a diff and publish them once you're ready.
@@ -165,16 +173,6 @@ GitLab allows you to squash all changes present in a merge request into a single
 commit when merging, to allow for a neater commit history.
 
 [Learn more about squash and merge.](squash_and_merge.md)
-=======
-## Commenting on any file line in merge requests
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/13950) in GitLab 11.5.
-
-GitLab provides a way of leaving comments in any part of the file being changed
-in a Merge Request. To do so, click the **...** button in the gutter of the Merge Request diff UI to expand the diff lines and leave a comment, just as you would for a changed line.
-
-![Comment on any diff file line](img/comment-on-any-diff-line.png)
->>>>>>> upstream/master
 
 ## Resolve conflicts