Fix scss conflict

app/assets/stylesheets/pages/groups.scss

@@ -158,7 +158,6 @@
   padding: $gl-padding 0;
   border-bottom: 1px solid $border-color;
 }
-<<<<<<< HEAD
 
 .groups-listing {
   .group-list-tree .group-row:first-child {
@@ -195,12 +194,6 @@
     width: 100%;
     margin-bottom: 0;
     margin-top: 4px;
-=======
-
-.groups-listing {
-  .group-list-tree .group-row:first-child {
-    border-top: 0;
->>>>>>> upstream/master
   }
 }