diff --git a/app/components/SimpleEditor/panes/Notes/notes.scss b/app/components/SimpleEditor/panes/Notes/notes.scss
index e0cbaa6a7a9577d088c50eb832630789db1506b0..ac16faf37e6f2e777b80ca7b70592dcb3ecde2f9 100644
--- a/app/components/SimpleEditor/panes/Notes/notes.scss
+++ b/app/components/SimpleEditor/panes/Notes/notes.scss
@@ -23,11 +23,7 @@ $bg-rgba: rgba(255, 255, 255, 0);
     cursor: row-resize;
     height: 10px;
     position: absolute;
-<<<<<<< HEAD
-    top: -14px;
-=======
     top: -6px;
->>>>>>> notes editor in separate pane
     width: 100%;
    }
   }