Resolve scss conflicts

app/assets/stylesheets/pages/issuable.scss

@@ -728,37 +728,6 @@
     }
   }
 }
-<<<<<<< HEAD
-
-.confidential-issue-warning {
-  background-color: $gl-gray;
-  border-radius: 3px;
-  padding: $gl-btn-padding $gl-padding;
-  margin-top: $gl-padding-top;
-  font-size: 14px;
-  color: $white-light;
-
-  .fa {
-    margin-right: 8px;
-  }
-
-  a {
-    color: $white-light;
-    text-decoration: underline;
-  }
-
-  &.affix {
-    position: static;
-    width: initial;
-
-    @media (min-width: $screen-sm-min) {
-      position: sticky;
-      position: -webkit-sticky;
-      top: 60px;
-      z-index: 200;
-    }
-  }
-}
 
 .add-issuable-form-input-wrapper {
   height: auto;
@@ -804,5 +773,3 @@
 .add-issuable-form-actions {
   margin-top: $gl-padding;
 }
-=======
->>>>>>> ce/master

app/assets/stylesheets/pages/settings.scss

@@ -127,7 +127,6 @@
   }
 }
 
-<<<<<<< HEAD
 .nested-settings {
   padding-left: 20px;
 }
@@ -150,7 +149,9 @@
 
   .pull-right {
     margin-left: auto;
-=======
+  }
+}
+
 .prometheus-metrics-monitoring {
   .panel {
     .panel-toggle {
@@ -211,6 +212,5 @@
     li + li {
       border-top: 1px solid $border-color;
     }
->>>>>>> ce/master
   }
 }