Resolve app/views/projects/project_members/_new_project_member.html.haml

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/views/projects/project_members/_new_project_member.html.haml

@@ -17,11 +17,6 @@
           = label_tag :expires_at, 'Access expiration date', class: 'label-bold'
           = text_field_tag :expires_at, nil, class: 'form-control js-access-expiration-date', placeholder: 'Expiration date'
           %i.clear-icon.js-clear-input
-<<<<<<< HEAD
-      = f.submit "Add to project", class: "btn btn-success"
+      = f.submit "Add to project", class: "btn btn-success qa-add-member-button"
       - if can?(current_user, :admin_project_member, @project) && !membership_locked?
         = link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
-=======
-      = f.submit "Add to project", class: "btn btn-success qa-add-member-button"
-      = link_to "Import", import_project_project_members_path(@project), class: "btn btn-default", title: "Import members from another project"
->>>>>>> upstream/master