diff --git a/config/i3/config b/config/i3/config
index 0e62b80..7116381 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -3,14 +3,8 @@ set $mod Mod4
 floating_modifier $mod
 set $refresh_i3status killall -SIGUSR1 i3status
 
-<<<<<<< HEAD
 # Font
-font pango:monospace 8
-=======
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
 font pango:monospace 9
->>>>>>> refs/remotes/origin/master
 
 # Modifiers
 tiling_drag modifier titlebar