diff --git a/src/gui/backend/Settings.java b/src/gui/backend/Settings.java
index 4e2db35..7831755 100644
--- a/src/gui/backend/Settings.java
+++ b/src/gui/backend/Settings.java
@@ -189,10 +189,7 @@ public class Settings {
             fontName = "HackNerdFontMono-Regular";
             fontFilepath = "/usr/share/fonts/TTF/" + fontName + ".ttf";
         }
-<<<<<<< HEAD
 
-=======
->>>>>>> main
         // Register the font with the GraphicsEnvironment.
         try {
             GraphicsEnvironment ge = GraphicsEnvironment.