Resolve SCSS conflicts

app/assets/stylesheets/framework/panels.scss

@@ -26,19 +26,18 @@
     margin-left: 5px;
   }
 
-<<<<<<< HEAD
   &.split {
     display: flex;
     align-items: center;
   }
-=======
+
   .panel-empty-heading {
     border-bottom: 0;
   }
 
   .panel-body {
     padding: $gl-padding;
->>>>>>> ce/master
+  }
 
   .left {
     flex: 1 1 auto;

app/assets/stylesheets/pages/boards.scss

@@ -459,7 +459,6 @@
   margin: 5px;
 }
 
-<<<<<<< HEAD
 .boards-title-holder {
   padding: 25px 13px $gl-padding;
 
@@ -480,8 +479,6 @@
   border-top: 1px solid $border-color;
 }
 
-=======
->>>>>>> ce/master
 .page-with-layout-nav.page-with-sub-nav .issue-boards-sidebar {
   &.right-sidebar {
     top: 0;

app/assets/stylesheets/pages/issues.scss

 @import "./issues/issue_count_badge";
-<<<<<<< HEAD
 @import "./issues/related_issues";
-=======
->>>>>>> ce/master
 
 .issues-list {
   .issue {

app/assets/stylesheets/pages/pipelines.scss

@@ -564,9 +564,7 @@
     }
 
     .build-content {
-<<<<<<< HEAD
       @include build-content();
-=======
       display: inline-block;
       padding: 8px 10px 9px;
       width: 100%;
@@ -580,7 +578,6 @@
       background-color: $stage-hover-bg;
       border: 1px solid $stage-hover-border;
       color: $gl-text-color;
->>>>>>> ce/master
     }
 
     // Connect first build in each stage with right horizontal line