Resolve conflicts due to the new 'only_allow_merge_if_build_succeeds' feature

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/projects/_merge_request_settings.html.haml

-<<<<<<< HEAD
 %fieldset.merge-request-feature.append-bottom-default
   %h5.prepend-top-0
     Merge requests
@@ -79,13 +78,6 @@
         - if @project.approvers.empty?
           %li There are no approvers
 
-
-:javascript
-  new UsersSelect();
-=======
-%fieldset.builds-feature
-  %h5.prepend-top-0
-    Merge Requests
   .form-group
     .checkbox
       = f.label :only_allow_merge_if_build_succeeds do
@@ -94,4 +86,6 @@
       .help-block
         Builds need to be configured to enable this feature.
         = link_to icon('question-circle'), help_page_path('workflow', 'merge_requests#only-allow-merge-requests-to-be-merged-if-the-build-succeeds')
->>>>>>> 65df6bcb898e067e380658431136b5ef9aaba3b0
+
+:javascript
+  new UsersSelect();

app/views/projects/merge_requests/widget/_open.html.haml

@@ -21,15 +21,11 @@
       = render 'projects/merge_requests/widget/open/merge_when_build_succeeds'
     - elsif !@merge_request.can_be_merged_by?(current_user)
       = render 'projects/merge_requests/widget/open/not_allowed'
-<<<<<<< HEAD
+    - elsif !@merge_request.mergeable_ci_state? && @pipeline && @pipeline.failed?
+      = render 'projects/merge_requests/widget/open/build_failed'
     - elsif @merge_request.must_be_rebased?
       = render 'projects/merge_requests/widget/open/rebase'
     - else
-=======
-    - elsif !@merge_request.mergeable_ci_state? && @pipeline && @pipeline.failed?
-      = render 'projects/merge_requests/widget/open/build_failed'
-    - elsif @merge_request.can_be_merged?
->>>>>>> 65df6bcb898e067e380658431136b5ef9aaba3b0
       = render 'projects/merge_requests/widget/open/accept'
 
   - if @closes_issues.present?