CE->EE: Fix conflict in doc/user/project/merge_requests/fast_forward_merge.md

doc/user/project/merge_requests/fast_forward_merge.md

@@ -28,16 +28,8 @@ Now, when you visit the merge request page, you will be able to accept it
 ![Fast forward merge request](img/ff_merge_mr.png)
 
 If the target branch is ahead of the source branch, you need to rebase the
-<<<<<<< HEAD
-source branch before you will be able to do a fast-forward merge.
-
-![Fast forward merge rebase](img/ff_merge_rebase.png)
-
-[products]: https://about.gitlab.com/products/ "GitLab products page"
-=======
 source branch locally before you will be able to do a fast-forward merge.
 
 ![Fast forward merge rebase locally](img/ff_merge_rebase_locally.png)
 
->>>>>>> ce/master
 [ffonly]: https://git-scm.com/docs/git-merge#git-merge---ff-only