diff --git a/.config/emacs/config.el b/.config/emacs/config.el
index bc78b29..690a04c 100644
--- a/.config/emacs/config.el
+++ b/.config/emacs/config.el
@@ -730,7 +730,3 @@
     (browse-url
      (concat "https://github.com/search?l=" language
              "&type=code&q=" code))))
-<<<<<<< HEAD
-
-=======
->>>>>>> 987492dc041b7a12f6a57be035df64dd74fc6c09