Resolve conflicts in projects.scss

app/assets/stylesheets/pages/projects.scss

@@ -46,10 +46,7 @@
 
   @media (max-width: $screen-xs-max) {
     .input-group > div {
-<<<<<<< HEAD
 
-=======
->>>>>>> upstream/master
       &:last-child {
         margin-bottom: 0;
       }
@@ -956,7 +953,11 @@ a.allowed-to-push {
       border-right: solid 1px transparent;
     }
   }
-<<<<<<< HEAD
+
+  .dropdown-menu-toggle {
+    width: 100%;
+    max-width: 300px;
+  }
 
   .flash-container {
     padding: 0;
@@ -967,16 +968,6 @@ a.allowed-to-push {
   @extend .btn.disabled;
 }
 
-.protected-tags-list {
-=======
-
->>>>>>> upstream/master
-  .dropdown-menu-toggle {
-    width: 100%;
-    max-width: 300px;
-  }
-}
-
 .custom-notifications-form {
   .is-loading {
     .custom-notification-event-loading {