diff --git a/emacs/config.el b/emacs/config.el
index 02e4af8..44fb97e 100644
--- a/emacs/config.el
+++ b/emacs/config.el
@@ -8,13 +8,8 @@
 
 ;; Firacode is broken with Emacs-plus on osx. Fallback to Hasklig
 (setq doom-font (font-spec :family "Hasklig" :size 14)
-<<<<<<< HEAD
       doom-variable-pitch-font (font-spec :family "ETbembo"  :size 19)
       doom-big-font (font-spec :family "Hasklig" :size 16))
-=======
-      doom-variable-pitch-font (font-spec :family "Alegreya"  :size 17)
-      doom-big-font (font-spec :family "Hasklig" :size 17))
->>>>>>> 65c8b81 (You know I think I may need glasses at some point.)
 
 ;; Set font
 (pcase (system-name)