diff --git a/.config/emacs/config.el b/.config/emacs/config.el
index 3684674..bc78b29 100644
--- a/.config/emacs/config.el
+++ b/.config/emacs/config.el
@@ -730,4 +730,7 @@
     (browse-url
      (concat "https://github.com/search?l=" language
              "&type=code&q=" code))))
+<<<<<<< HEAD
 
+=======
+>>>>>>> 987492dc041b7a12f6a57be035df64dd74fc6c09
diff --git a/.config/emacs/config.org b/.config/emacs/config.org
index aa8fca0..55d4510 100644
--- a/.config/emacs/config.org
+++ b/.config/emacs/config.org
@@ -1061,4 +1061,7 @@ With Emacs version 29, true transparency has been added.  I have turned transpar
              "&type=code&q=" code))))
   
 #+end_src
+<<<<<<< HEAD
 
+=======
+>>>>>>> 987492dc041b7a12f6a57be035df64dd74fc6c09