Resolve doc/user/project/merge_requests/squash_and_merge.md

doc/user/project/merge_requests/squash_and_merge.md

@@ -18,11 +18,7 @@ Into a single commit on merge:
 
 ![A squashed commit followed by a merge commit][squashed-commit]
 
-<<<<<<< HEAD
 The squashed commit's commit message is the merge request title. And note that
-=======
-The squashed commit's commit message is the merge request title. And note that 
->>>>>>> upstream/master
 the squashed commit is still followed by a merge commit, as the merge
 method for this example repository uses a merge commit. Squashing also works
 with the fast-forward merge strategy, see
@@ -34,11 +30,7 @@ details.
 When working on a feature branch, you sometimes want to commit your current
 progress, but don't really care about the commit messages. Those 'work in
 progress commits' don't necessarily contain important information and as such
-<<<<<<< HEAD
 you'd rather not include them in your target branch.
-=======
-you'd rather not include them in your target branch. 
->>>>>>> upstream/master
 
 With squash and merge, when the merge request is ready to be merged,
 all you have to do is enable squashing before you press merge to join