diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org
index fb18f1cb..95967209 100644
--- a/config/emacs/emacs.org
+++ b/config/emacs/emacs.org
@@ -206,11 +206,6 @@ kept-old-versions 5)
   :config
   (load-theme 'doom-monokai-spectrum t))
 
-<<<<<<< HEAD
-  (use-package monokai-theme
-    :config
-    (load-theme 'monokai t))
-=======
 ;; emacsclient things
 (setq frame-resize-pixelwise t)
 ;; ui settings apparently go below