Fix conflicts in presenters and serializers

app/presenters/merge_request_presenter.rb

@@ -73,15 +73,12 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
   def conflict_resolution_path
     if conflicts.can_be_resolved_in_ui? && conflicts.can_be_resolved_by?(current_user)
       conflicts_project_merge_request_path(project, merge_request)
-<<<<<<< HEAD
     end
   end
 
   def rebase_path
     if !rebase_in_progress? && should_be_rebased? && user_can_push_to_source_branch?
       rebase_project_merge_request_path(project, merge_request)
-=======
->>>>>>> ce/master
     end
   end
 
@@ -94,15 +91,12 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
   def source_branch_path
     if source_branch_exists?
       project_branch_path(source_project, source_branch)
-<<<<<<< HEAD
     end
   end
 
   def approvals_path
     if requires_approve?
       approvals_project_merge_request_path(project, merge_request)
-=======
->>>>>>> ce/master
     end
   end
 

app/serializers/environment_entity.rb

@@ -24,14 +24,11 @@ class EnvironmentEntity < Grape::Entity
   expose :terminal_path, if: ->(environment, _) { environment.deployment_service_ready? } do |environment|
     can?(request.current_user, :admin_environment, environment.project) &&
       terminal_project_environment_path(environment.project, environment)
-<<<<<<< HEAD
   end
 
   expose :rollout_status_path, if: ->(environment, _) { environment.deployment_service_ready? } do |environment|
     can?(request.current_user, :read_deploy_board, environment.project) &&
       status_project_environment_path(environment.project, environment, format: :json)
-=======
->>>>>>> ce/master
   end
 
   expose :created_at, :updated_at

app/serializers/merge_request_entity.rb

@@ -180,7 +180,6 @@ class MergeRequestEntity < IssuableEntity
 
   expose :commit_change_content_path do |merge_request|
     commit_change_content_project_merge_request_path(merge_request.project, merge_request)
-<<<<<<< HEAD
   end
 
   # EE-specific
@@ -196,8 +195,6 @@ class MergeRequestEntity < IssuableEntity
                                       merge_request.base_codeclimate_artifact,
                                       path: 'codeclimate.json')
     end
-=======
->>>>>>> ce/master
   end
 
   private