Resolve SCSS conflicts

app/assets/stylesheets/framework/variables.scss

@@ -188,14 +188,11 @@ $divergence-graph-bar-bg: #ccc;
 $divergence-graph-separator-bg: #ccc;
 $general-hover-transition-duration: 100ms;
 $general-hover-transition-curve: linear;
-<<<<<<< HEAD
+$highlight-changes-color: rgb(235, 255, 232);
 $issue-box-upcoming-bg: #8f8f8f;
 $pages-group-name-color: #4c4e54;
 $ldap-members-override-bg: $orange-50;
-=======
-$highlight-changes-color: rgb(235, 255, 232);
 
->>>>>>> ce/master
 
 /*
 * Common component specific colors

app/assets/stylesheets/pages/environments.scss

@@ -123,7 +123,6 @@
   }
 }
 
-<<<<<<< HEAD
 /**
  * Deploy boards
  */
@@ -271,7 +270,9 @@
     width: 20px;
     display: block;
     font-size: 20px;
-=======
+  }
+}
+
 .gl-responsive-table-row {
   .environments-actions {
     @media (min-width: $screen-md-min) {
@@ -317,7 +318,6 @@
   @media (max-width: $screen-sm-max) {
     border-top: 1px solid $white-normal;
     margin-top: 10px;
->>>>>>> ce/master
   }
 }
 

app/assets/stylesheets/pages/pipelines.scss

@@ -998,7 +998,6 @@
   }
 }
 
-<<<<<<< HEAD
 /**
  * Cross-project pipelines (applied conditionally to pipeline graph)
  */
@@ -1110,7 +1109,7 @@
   font-size: 10px;
   vertical-align: top;
 }
-=======
+
 .pipeline-header-container {
   min-height: 55px;
 
@@ -1118,4 +1117,4 @@
     padding-top: 12px;
   }
 }
->>>>>>> ce/master
+

app/assets/stylesheets/pages/projects.scss

@@ -697,16 +697,12 @@ pre.light-well {
   }
 }
 
-<<<<<<< HEAD
 a.allowed-to-merge,
 a.allowed-to-push {
   cursor: pointer;
 }
 
 .new-protected-branch,
-=======
-.new_protected_branch,
->>>>>>> ce/master
 .new-protected-tag {
   label {
     margin-top: 6px;
@@ -714,7 +710,6 @@ a.allowed-to-push {
   }
 }
 
-<<<<<<< HEAD
 .protected-branch-push-access-list,
 .protected-branch-merge-access-list {
   a {
@@ -722,8 +717,6 @@ a.allowed-to-push {
   }
 }
 
-=======
->>>>>>> ce/master
 .create-new-protected-branch-button,
 .create-new-protected-tag-button {
   @include dropdown-link;