Resolve conflicts in app/views/shared/issuable/form/merge_params.html.haml.

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

@@ -6,21 +6,21 @@
 -# This check is duplicated below, to avoid conflicts with EE.
 - return unless issuable.can_remove_source_branch?(current_user)
 
+- if issuable.can_remove_source_branch?(current_user)
+  .form-group
+    .col-sm-10.col-sm-offset-2
+      .checkbox
+        - initial_checkbox_value = issuable.merge_params.key?('force_remove_source_branch') ? issuable.force_remove_source_branch? : true
+        = label_tag 'merge_request[force_remove_source_branch]' do
+          = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
+          = check_box_tag 'merge_request[force_remove_source_branch]', '1', initial_checkbox_value
+          Remove source branch when merge request is accepted.
+
 .form-group
   .col-sm-10.col-sm-offset-2
-<<<<<<< HEAD
     .checkbox
       = label_tag 'merge_request[squash]' do
         = hidden_field_tag 'merge_request[squash]', '0', id: nil
         = check_box_tag 'merge_request[squash]', '1', issuable.squash
         Squash commits when merge request is accepted.
         = link_to 'About this feature', help_page_path('user/project/merge_requests/squash_and_merge')
-=======
-    - if issuable.can_remove_source_branch?(current_user)
-      .checkbox
-        - initial_checkbox_value = issuable.merge_params.key?('force_remove_source_branch') ? issuable.force_remove_source_branch? : true
-        = label_tag 'merge_request[force_remove_source_branch]' do
-          = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil
-          = check_box_tag 'merge_request[force_remove_source_branch]', '1', initial_checkbox_value
-          Remove source branch when merge request is accepted.
->>>>>>> ce-com/master