diff --git a/.haml-lint.yml b/.haml-lint.yml
index 6e15c958d636a12e1b4ffc318f1782951e8f2471..32c7de0fb78b47bc01bcfa23c1d8fc925e494d51 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -41,12 +41,9 @@ linters:
   ImplicitDiv:
     enabled: true
 
-<<<<<<< HEAD
-=======
   InlineJavaScript:
     enabled: true
 
->>>>>>> upstream/master
   InlineStyles:
     enabled: false