update issue page

app/assets/stylesheets/framework/issue_box.scss

@@ -23,14 +23,9 @@
     background-color: $gl-primary;
     color: #FFF;
   }
-
-<<<<<<< HEAD
+  
   &.issue-box-open {
     background-color: #31af64;
-=======
-  &.status-box-open {
-    background-color: #019875;
->>>>>>> 110a5f9c96457ac314f30630735dd827d9d96a4c
     color: #FFF;
   }