CE->EE Conflict resolving

app/controllers/projects/merge_requests_controller.rb

@@ -310,20 +310,15 @@ class Projects::MergeRequestsController < Projects::ApplicationController
         if @merge_request.valid?
           redirect_to([@merge_request.target_project.namespace.becomes(Namespace), @merge_request.target_project, @merge_request])
         else
+          set_suggested_approvers
+
           render :edit
         end
       end
-<<<<<<< HEAD
-    else
-      set_suggested_approvers
-
-      render "edit"
-=======
       
       format.json do
         render json: @merge_request.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: [:task_status, :task_status_short])
       end
->>>>>>> 7733f285aca97d444382a59eda0ea3e303539c26
     end
   rescue ActiveRecord::StaleObjectError
     render_conflict_response

app/views/shared/issuable/_search_bar.html.haml

@@ -82,7 +82,6 @@
                   %span.dropdown-label-box{ style: 'background: {{color}}' }
                   %span.label-title.js-data-value
                     {{title}}
-<<<<<<< HEAD
           - if type == :issues
             #js-dropdown-weight.dropdown-menu{ data: { icon: 'balance-scale', hint: 'weight', tag: 'weight' } }
               %ul{ 'data-dropdown' => true }
@@ -98,12 +97,8 @@
                   %li.filter-dropdown-item{ 'data-value' => "#{weight}" }
                     %button.btn.btn-link= weight
 
-        .pull-right
-          = render 'shared/sort_dropdown', type: local_assigns[:type]
-=======
         .pull-right.filter-dropdown-container
           = render 'shared/sort_dropdown'
->>>>>>> 7733f285aca97d444382a59eda0ea3e303539c26
 
     - if @bulk_edit
       .issues_bulk_update.hide

lib/api/services.rb

@@ -609,11 +609,8 @@ module API
       SlackService,
       MattermostService,
       TeamcityService,
-<<<<<<< HEAD
       JenkinsService,
       JenkinsDeprecatedService
-=======
->>>>>>> 7733f285aca97d444382a59eda0ea3e303539c26
     ]
 
     if Rails.env.development?