diff --git a/config/polybar/config.ini b/config/polybar/config.ini
index a877017..aad6c2c 100644
--- a/config/polybar/config.ini
+++ b/config/polybar/config.ini
@@ -34,15 +34,9 @@ dim-value = 1.0
 locale = en_US.UTF-8
 
 font-0 = Hack:size=10;3
-<<<<<<< HEAD
 font-1 = Font Awesome 6 Free:style=Solid:size=12;3
 font-2 = Font Awesome 6 Free:style=Regular:size=12;3
 font-3 = Font Awesome 6 Brands:style=Regular:size=12;3
-=======
-font-1 = Font Awesome 5 Free:style=Solid:size=12;3
-font-2 = Font Awesome 5 Free:style=Regular:size=12;3
-font-3 = Font Awesome 5 Brands:style=Regular:size=12;3
->>>>>>> 26b8507 (Fix rebase conflicts)
 
 modules-left = workspaces sep title
 modules-center = spotify