diff --git a/init.lua b/init.lua
index 98da0a97..2f40dfd6 100644
--- a/init.lua
+++ b/init.lua
@@ -90,8 +90,13 @@ P.S. You can delete this when you're done too. It's your config now! :)
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
+<<<<<<< HEAD
 -- Set to true if you have a Nerd Font installed and selected in the terminal
 vim.g.have_nerd_font = false
+=======
+-- Set to true if you have a Nerd Font installed
+vim.g.have_nerd_font = true
+>>>>>>> e91ac7d (wip)
 
 -- [[ Setting options ]]
 -- See `:help vim.o`