diff --git a/config/emacs/emacs.org b/config/emacs/emacs.org
index ad711d22..fb18f1cb 100644
--- a/config/emacs/emacs.org
+++ b/config/emacs/emacs.org
@@ -201,38 +201,40 @@ kept-old-versions 5)
 #+end_src
 ** Appearance
 #+begin_src emacs-lisp
-  ;; TODO: change this for something better i guess
-  ;; (use-package doom-themes
-  ;;   :config
-  ;;   (load-theme 'doom-monokai-spectrum t))
+;; TODO: change this for something better i guess
+(use-package doom-themes
+  :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
+(setq default-frame-alist '((font . "JetBrainsMono NF")
+                            '(vertical-scroll-bars . nil)
+                            '(horizontal-scroll-bars . nil)))
+>>>>>>> parent of e33b8f5 (config/emacs: use moe-theme)
 
-  ;; emacsclient things
-  (setq frame-resize-pixelwise t)
-  ;; ui settings apparently go below
-  (setq default-frame-alist '((font . "JetBrainsMono NF")
-                              '(vertical-scroll-bars . nil)
-                              '(horizontal-scroll-bars . nil)))
-
-  ;; GO AWAY
-  (defun my/disable-scroll-bars (frame)
-    (modify-frame-parameters frame
-                             '((vertical-scroll-bars . nil)
-                               (horizontal-scroll-bars . nil))))
-  (add-hook 'after-make-frame-functions 'my/disable-scroll-bars)
+;; GO AWAY
+(defun my/disable-scroll-bars (frame)
+  (modify-frame-parameters frame
+                           '((vertical-scroll-bars . nil)
+                             (horizontal-scroll-bars . nil))))
+(add-hook 'after-make-frame-functions 'my/disable-scroll-bars)
 
 
-  ;; y/n is better than yes/no
-  (fset 'yes-or-no-p 'y-or-n-p)
+;; y/n is better than yes/no
+(fset 'yes-or-no-p 'y-or-n-p)
 
-  ;; font
-  (set-face-attribute 'default nil
-  		    :font "JetBrainsMono NF"
-  		    :weight 'light
-  		    :height 125)
+;; font
+(set-face-attribute 'default nil
+		    :font "JetBrainsMono NF"
+		    :weight 'light
+		    :height 125)
 #+end_src
 ** Emacs Client
 #+begin_src emacs-lisp