Update merge_requests.scss

app/assets/stylesheets/pages/merge_requests.scss

@@ -780,12 +780,11 @@
   margin-right: -5px;
 }
 
-<<<<<<< HEAD
-
 .mr-widget-icon {
   font-size: 22px;
   margin: 0 10px 0 0;
-=======
+}
+
 .deploy-heading {
   .media-body {
     min-width: 0;
@@ -817,5 +816,4 @@
     min-width: 0;
     max-width: 100%;
   }
->>>>>>> upstream/master
 }