Fix conflict in app/views/shared/_new_commit_form.html.haml

app/views/shared/_new_commit_form.html.haml

@@ -8,11 +8,7 @@
 - else
   - if can?(current_user, :push_code, @project)
     .form-group.row.branch
-<<<<<<< HEAD
-      = label_tag 'branch_name', _('Target Branch'), class: 'col-form-label'
-=======
       = label_tag 'branch_name', _('Target Branch'), class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
       .col-sm-10
         = text_field_tag 'branch_name', branch_name, required: true, class: "form-control js-branch-name ref-name"