Fix conflict in app/views/groups/group_members/_new_group_member.html.haml

app/views/groups/group_members/_new_group_member.html.haml

 = form_for @group_member, url: group_group_members_path(@group), html: { class: 'users-project-form users-group-form' } do |f|
   .row
     .col-md-4.col-lg-6
-<<<<<<< HEAD
       = users_select_tag(:user_ids, multiple: true, class: 'input-clamp', scope: :all, email_user: true, skip_ldap: @group.ldap_synced?)
-=======
-      = users_select_tag(:user_ids, multiple: true, class: 'input-clamp', scope: :all, email_user: true)
->>>>>>> gitlab-ce/master
       .form-text.text-muted.append-bottom-10
         Search for members by name, username, or email, or invite new ones using their email address.