diff --git a/public/app/system.conf.js b/public/app/system.conf.js
index c16375d456d..bea81e2cac5 100644
--- a/public/app/system.conf.js
+++ b/public/app/system.conf.js
@@ -39,7 +39,7 @@ System.config({
     "jquery-ui": "vendor/jquery-ui/custom.js",
     "gridstack": "vendor/npm/gridstack/dist/gridstack.js",
     "gridstack.jquery-ui": "vendor/npm/gridstack/dist/gridstack.jQueryUI.js",
-    "ace": "vendor/npm/ace-builds/src-noconflict/ace"
+    "ace": "vendor/npm/ace-builds/src-noconflict/ace",
     "clipboard": "vendor/npm/clipboard/dist/clipboard.js"
   },
 
diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss
index 9b492d5b017..4ccabb5f19a 100644
--- a/public/sass/components/_navbar.scss
+++ b/public/sass/components/_navbar.scss
@@ -62,42 +62,37 @@
   background-color: $navbarLinkBackgroundActive;
 }
 
-.navbar-page-btn-wrapper {
-  float: left;
-<<<<<<< HEAD
-||||||| merged common ancestors
+.navbar-page-btn {
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  display: block;
   margin: 0;
-  border-right: 1px solid $tight-form-border;
-  background-color: $navbarButtonBackground;
-  padding: 0.4rem 1.0rem 0.4rem 1rem;
+  color: darken($link-color, 5%);
+  font-size: $font-size-lg;
+  padding: 1rem 1rem 0.75rem 1rem;
   min-height:: $navbarHeight;
 
   .fa-caret-down {
-    font-size: 70%;
+    font-size: 60%;
+    padding-left: 0.2rem;
   }
 
-  .fa-chevron-left{
-    display: none;
+  .icon-gf {
+    position: relative;
+    top: 2px;
+    font-size: 20px;
+    line-height: 8px;
+    margin-right: 0.5rem;
   }
 
-=======
-  margin: 0;
-  border-right: 1px solid $tight-form-border;
-  background-color: $navbarButtonBackground;
-  padding: 0.4rem 1.0rem 0.4rem 1rem;
-  min-height: $navbarHeight;
-
-  .fa-caret-down {
-    font-size: 70%;
+  > img {
+    max-width: 27px;
+    max-height: 27px;
   }
 
-  .fa-chevron-left{
-    display: none;
-  }
-
->>>>>>> 0e5e2f3fb990293632402b20107aa09999c3f844
-  &:hover {
-    background: $navbarButtonBackgroundHighlight;
+  &--search {
+    padding: 1rem 1.5rem 0.75rem 1.5rem;
   }
 }
 
diff --git a/public/test/test-main.js b/public/test/test-main.js
index 99e235e82e6..eff23656d14 100644
--- a/public/test/test-main.js
+++ b/public/test/test-main.js
@@ -65,7 +65,6 @@
     },
 
     meta: {
-<<<<<<< HEAD
       'vendor/npm/jquery-ui/jquery-ui.js': {
         format: 'amd',
         deps: ['jquery'],
@@ -78,12 +77,7 @@
         format: 'global',
         deps: ['gridstack'],
       },
-      'vendor/angular/angular.js': {
-||||||| merged common ancestors
-      'vendor/angular/angular.js': {
-=======
       'vendor/npm/angular/angular.js': {
->>>>>>> 0e5e2f3fb990293632402b20107aa09999c3f844
         format: 'global',
         deps: ['jquery'],
         exports: 'angular',