Resolve conflict on app/views/projects/edit.html.haml

app/views/projects/edit.html.haml

@@ -97,15 +97,10 @@
       = render 'shared/promotions/promote_mr_features'
 
       = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "merge-request-settings-form" }, authenticity_token: true do |f|
-<<<<<<< HEAD
         = render 'projects/ee/merge_request_settings', form: f
         = f.submit 'Save changes', class: "btn btn-save qa-save-merge-request-changes"
 
   = render 'projects/ee/service_desk_settings'
-=======
-        = render 'merge_request_settings', form: f
-        = f.submit 'Save changes', class: "btn btn-save qa-save-merge-request-changes"
->>>>>>> upstream/master
 
   = render 'export', project: @project