diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index 15339d2..01e1759 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -121,17 +121,12 @@ filechooser,
     > headerbar.titlebar {
       border: none;
       box-shadow: inset 0 1px rgba(white, 0.1);
-<<<<<<< HEAD
-      background-color: transparent;
-      background-image: $nautilus_header_image;
-=======
       background: none;
       @if $nautilus_use_colors {
         background-color: $base_color;
       } @else {
         background-image: $nautilus_header_image;
       }
->>>>>>> 7be96a064717d91fd07e989ba7e965dead4087cf
 
       > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - 80px; }