diff --git a/src/c3nav/editor/static/editor/css/editor.scss b/src/c3nav/editor/static/editor/css/editor.scss
index 858c2569..14c8cc3d 100644
--- a/src/c3nav/editor/static/editor/css/editor.scss
+++ b/src/c3nav/editor/static/editor/css/editor.scss
@@ -607,7 +607,6 @@ label.theme-color-label {
     z-index: 1000;
     pointer-events: none;
 }
-<<<<<<< HEAD
 
 @keyframes snap-pulse {
     0% {
@@ -676,5 +675,3 @@ label.theme-color-label {
         opacity: 0.7;
     }
 }
-=======
->>>>>>> 90d3c9b7f5f567b6bbe37f3432b49f65710bf26c