Resolve conflicts in controllers

app/controllers/projects/merge_requests/application_controller.rb

 class Projects::MergeRequests::ApplicationController < Projects::ApplicationController
-<<<<<<< HEAD
   prepend ::EE::Projects::MergeRequests::ApplicationController
 
-=======
->>>>>>> ce/master
   before_action :check_merge_requests_available!
   before_action :merge_request
   before_action :authorize_read_merge_request!

app/controllers/projects/merge_requests/creations_controller.rb

 class Projects::MergeRequests::CreationsController < Projects::MergeRequests::ApplicationController
   include DiffForPath
   include DiffHelper
-<<<<<<< HEAD
+
   prepend ::EE::Projects::MergeRequests::CreationsController
-=======
->>>>>>> ce/master
 
   skip_before_action :merge_request
   skip_before_action :ensure_ref_fetched

app/controllers/projects/merge_requests_controller.rb

@@ -4,17 +4,12 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
   include RendersNotes
   include ToggleAwardEmoji
   include IssuableCollections
-  prepend ::EE::Projects::MergeRequestsController
 
-  skip_before_action :merge_request, only: [:index, :bulk_update]
-  skip_before_action :ensure_ref_fetched, only: [:index, :bulk_update]
+  prepend ::EE::Projects::MergeRequestsController
 
-<<<<<<< HEAD
-=======
   skip_before_action :merge_request, only: [:index, :bulk_update]
   skip_before_action :ensure_ref_fetched, only: [:index, :bulk_update]
 
->>>>>>> ce/master
   before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :remove_wip, :sort]
 
   before_action :authenticate_user!, only: [:assign_related_issues]