diff --git a/app/javascript/styles/macaron/diff.scss b/app/javascript/styles/macaron/diff.scss
index da67c5989..47853a21e 100644
--- a/app/javascript/styles/macaron/diff.scss
+++ b/app/javascript/styles/macaron/diff.scss
@@ -1169,7 +1169,6 @@ button.icon-button.disabled i.fa-retweet {
   }
 }
 
-<<<<<<< HEAD
 #navigation-panel__publish {
   i {
     color: $ui-base-lighter-color;