diff --git a/css/_variables.scss b/css/_variables.scss
index 218a66f2f..7ccfc269e 100644
--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -1,5 +1,4 @@
 /**
-<<<<<<< HEAD
  * Style variables
  */
 $baseFontFamily: 'open_sanslight', 'Helvetica Neue', Helvetica, Arial, sans-serif;