Resolve projects.scss conflict and move into ee

app/assets/stylesheets/pages/projects.scss

@@ -907,16 +907,6 @@ a.allowed-to-push {
   }
 }
 
-<<<<<<< HEAD
-.protected-branch-push-access-list,
-.protected-branch-merge-access-list {
-  a {
-    color: $white-light;
-  }
-}
-
-=======
->>>>>>> upstream/master
 .protected-branches-list,
 .protected-tags-list {
   margin-bottom: 30px;

ee/app/assets/stylesheets/pages/projects.scss

+.protected-branch-push-access-list,
+.protected-branch-merge-access-list {
+  a {
+    color: $white-light;
+  }
+}
+
 .project-mirror-settings {
   .fingerprint-verified {
     color: $green-500;