Fix conflict in app/views/projects/merge_requests/creations/_new_compare.html.haml

app/views/projects/merge_requests/creations/_new_compare.html.haml

@@ -5,11 +5,7 @@
   .hide.alert.alert-danger.mr-compare-errors
   .js-merge-request-new-compare.row{ 'data-source-branch-url': project_new_merge_request_branch_from_path(@source_project), 'data-target-branch-url': project_new_merge_request_branch_to_path(@source_project) }
     .col-lg-6
-<<<<<<< HEAD
-      .card.panel-new-merge-request
-=======
       .card.card-new-merge-request
->>>>>>> gitlab-ce/master
         .card-header
           Source branch
         .card-body.clearfix
@@ -36,11 +32,7 @@
           %ul.list-unstyled.mr_source_commit
 
     .col-lg-6
-<<<<<<< HEAD
-      .card.panel-new-merge-request
-=======
       .card.card-new-merge-request
->>>>>>> gitlab-ce/master
         .card-header
           Target branch
         .card-body.clearfix