added merge-related fixes

src/gui/backend/Settings.java

@@ -189,7 +189,10 @@ 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.

src/run.sh

@@ -22,6 +22,17 @@ function run() {
                 jar cfe sudoku.jar App -C bin .
                 ;;
 
+            "-h" | "--help")
+                echo "Usage: run.sh [OPTION]"
+                echo "Run the program"
+                echo
+                echo "Options:"
+                echo "  -c, --cli    Run the program in the CLI"
+                echo "  -b, --build  Compile the program"
+                echo "  -j, --jar    Create a JAR file"
+                echo "  -h, --help   Display this help message"
+                ;;
+
             *)
                 echo "Invalid argument"
                 ;;