Fix navigation conflicts

app/assets/stylesheets/framework.scss

@@ -29,12 +29,6 @@
 @import "framework/media_object";
 @import "framework/mobile";
 @import "framework/modal";
-<<<<<<< HEAD
-@import "framework/media_object";
-@import "framework/nav";
-@import "framework/new-nav";
-=======
->>>>>>> ce-com/master
 @import "framework/pagination";
 @import "framework/panels";
 @import "framework/secondary-navigation-elements";

app/assets/stylesheets/pages/boards.scss

@@ -477,9 +477,6 @@
   border-top: 1px solid $border-color;
 }
 
-.page-with-layout-nav.page-with-sub-nav .issue-boards-sidebar,
-=======
->>>>>>> ce-com/master
 .page-with-new-sidebar.page-with-sidebar .issue-boards-sidebar {
   .issuable-sidebar-header {
     position: relative;

app/assets/stylesheets/pages/issuable.scss

@@ -14,13 +14,10 @@
   width: $issuable-warning-size;
   height: $issuable-warning-size;
   text-align: center;
-<<<<<<< HEAD
-=======
 
   &:first-of-type {
     margin-right: $issuable-warning-icon-margin;
   }
->>>>>>> ce-com/master
 }
 
 .sidebar-item-icon {

app/views/layouts/header/_default.html.haml

-<<<<<<< HEAD
 = render "layouts/header/ee_license_banner"
 
-%header.navbar.navbar-gitlab.navbar-gitlab-new
-=======
 %header.navbar.navbar-gitlab
->>>>>>> ce-com/master
   %a.sr-only.gl-accessibility{ href: "#content-body", tabindex: "1" } Skip to content
   .container-fluid
     .header-content