Solve mardown and merge_requests stylesheets conflicts

app/assets/stylesheets/framework/markdown_area.scss

@@ -61,13 +61,10 @@
       padding-top: 0;
       line-height: 19px;
 
-<<<<<<< HEAD
       &.btn.btn-sm {
         padding: 2px 5px;
       }
 
-=======
->>>>>>> upstream/master
       &:focus {
         margin-top: -10px;
         padding-top: 10px;

app/assets/stylesheets/pages/merge_requests.scss

@@ -51,15 +51,12 @@
       opacity: 0.3;
     }
 
-<<<<<<< HEAD
     &.btn-sm {
       line-height: 1;
       padding: 5px 10px;
       margin-top: 1px;
     }
 
-=======
->>>>>>> upstream/master
     &.dropdown-toggle {
       .fa {
         color: inherit;