diff --git a/.config/emacs/config.el b/.config/emacs/config.el
index d27c88a..ca822c1 100644
--- a/.config/emacs/config.el
+++ b/.config/emacs/config.el
@@ -721,7 +721,10 @@
      (concat "https://github.com/search?l=" language
              "&type=code&q=" code))))
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
+=======
+>>>>>>> 67ddcb090fdcd5be954bb3af13ae6dbc236d988f
   
 (defun dm-search ()
   "Search various search engines."
@@ -745,4 +748,7 @@
                          ("3" "Three"))))              
       (cadr (assoc (completing-read "Choose: " completions) completions)))))
   (message "You choose `%s'" choice))
+<<<<<<< HEAD
+>>>>>>> 67ddcb090fdcd5be954bb3af13ae6dbc236d988f
+=======
 >>>>>>> 67ddcb090fdcd5be954bb3af13ae6dbc236d988f