Fix conflicts

app/assets/stylesheets/framework/nav.scss

@@ -350,7 +350,6 @@
 
 .scrolling-tabs-container {
   position: relative;
-  overflow: hidden;
 
   .merge-request-tabs-container & {
     overflow: hidden;
@@ -493,10 +492,6 @@
 .inner-page-scroll-tabs {
   position: relative;
 
-  .nav-links {
-    padding-bottom: 1px;
-  }
-
   .fade-right {
     @include fade(left, $white-light);
     right: 0;