diff --git a/services/web/public/stylesheets/core/ol-variables.less b/services/web/public/stylesheets/core/ol-variables.less
index 8433c374b8..7a19278500 100644
--- a/services/web/public/stylesheets/core/ol-variables.less
+++ b/services/web/public/stylesheets/core/ol-variables.less
@@ -201,10 +201,7 @@
 @toolbar-icon-btn-hover-shadow    : none;
 @toolbar-border-bottom            : 1px solid @toolbar-border-color;
 @toolbar-icon-btn-hover-boxshadow : none;
-<<<<<<< HEAD
 @toolbar-font-size                : 13px;
-=======
->>>>>>> master
 
 // Editor file-tree
 @file-tree-bg                   : @ol-blue-gray-4;