Fix conflict in app/views/shared/issuable/form/_merge_params.html.haml

app/views/shared/issuable/form/_merge_params.html.haml

@@ -3,19 +3,9 @@
 - return unless issuable.is_a?(MergeRequest)
 - return if issuable.closed_without_fork?
 
-<<<<<<< HEAD
 - if issuable.can_remove_source_branch?(current_user)
   .form-group.row
     .col-sm-10.offset-sm-2
-=======
--# This check is duplicated below to avoid CE -> EE merge conflicts.
--# This comment and the following line should only exist in CE.
-- return unless issuable.can_remove_source_branch?(current_user)
-
-.form-group.row
-  .col-sm-10.offset-sm-2
-    - if issuable.can_remove_source_branch?(current_user)
->>>>>>> gitlab-ce/master
       .form-check
         = label_tag 'merge_request[force_remove_source_branch]' do
           = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil