diff --git a/purescript-font-lock.el b/purescript-font-lock.el
index 85d4b7d..9d6b65a 100644
--- a/purescript-font-lock.el
+++ b/purescript-font-lock.el
@@ -205,9 +205,6 @@ Returns keywords suitable for `font-lock-keywords'."
     (setq keywords
           `(;; NOTICE the ordering below is significant
             ;;
-            ("^<<<<<<< .*$" 0 'font-lock-warning-face t)
-            ("^=======" 0 'font-lock-warning-face t)
-            ("^>>>>>>> .*$" 0 'font-lock-warning-face t)
             ("^#.*$" 0 'font-lock-preprocessor-face t)
 
             (,reservedid 1 (symbol-value 'purescript-keyword-face))