diff --git a/assets/fonts/spartan_500.ttf b/assets/fonts/spartan_500.ttf
new file mode 100644
index 0000000..94b22ec
Binary files /dev/null and b/assets/fonts/spartan_500.ttf differ
diff --git a/src/main.c b/src/main.c
index 260222c..404eaa9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -522,15 +522,12 @@ void load_audio_assets(GameState *gs) {
 static void game_loop(unsigned int run_seed) {
   GameState gs;
   memset(&gs, 0, sizeof(GameState));
-<<<<<<< HEAD
   gs.run_seed = run_seed;
-=======
   // load external assets
   // sound
->>>>>>> acdbc9c (font: squash commit into main)
   load_audio_assets(&gs);
   // font
-  Font fontTTF = LoadFontEx("./assets/fonts/Tomorrow_Night.ttf", 24, NULL, 0);
+  Font fontTTF = LoadFontEx("./assets/fonts/spartan_500.ttf", 36, NULL, 0);
   // Initialize first floor
   init_floor(&gs, 1);