diff --git a/app/views/projects/project_members/import.html.haml b/app/views/projects/project_members/import.html.haml
index 3d4a07d3a734b9c7f27b8d359e5121cb425d6485..6a52e72bfd85692aa7789b8c38ea72bdb2e0a4d2 100644
--- a/app/views/projects/project_members/import.html.haml
+++ b/app/views/projects/project_members/import.html.haml
@@ -7,11 +7,7 @@
 %hr
 = form_tag apply_import_project_project_members_path(@project), method: 'post' do
   .form-group.row
-<<<<<<< HEAD
-    = label_tag :source_project_id, "Project", class: 'col-form-label'
-=======
     = label_tag :source_project_id, "Project", class: 'col-form-label col-sm-2'
->>>>>>> gitlab-ce/master
     .col-sm-10= select_tag(:source_project_id, options_from_collection_for_select(@projects, :id, :name_with_namespace), prompt: "Select project", class: "select2 lg", required: true)
 
   .form-actions