Resolve conflict in selects.scss

app/assets/stylesheets/framework/selects.scss

@@ -279,11 +279,8 @@
 
 // TODO: change global style
 .ajax-project-dropdown,
-<<<<<<< HEAD
-body[data-page="projects:settings:repository:show"] #select2-drop,
-=======
 body[data-page="projects:edit"] #select2-drop,
->>>>>>> ce-com/master
+body[data-page="projects:settings:repository:show"] #select2-drop,
 body[data-page="projects:new"] #select2-drop,
 body[data-page="projects:merge_requests:edit"] #select2-drop,
 body[data-page="projects:blob:new"] #select2-drop,