diff --git a/.DS_Store b/.DS_Store
index ce647ae..e632dd3 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/src/game/Game.cpp b/src/game/Game.cpp
index 3f4dc24..5e3424c 100644
--- a/src/game/Game.cpp
+++ b/src/game/Game.cpp
@@ -145,6 +145,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
         }
         
         std::string kaijuTex = Game::projPath + "assets/textures/actors/kaijuturtle.png";
+<<<<<<< HEAD
         std::string fontTex = Game::projPath + "assets/textures/ui/ui-font-lorez5.png";
         std::string textBoxTex = Game::projPath + "assets/textures/ui/ui-element-bubble.png";
         std::string musicFile = Game::projPath + "assets/audio/music/sillypuppy.ogg";
@@ -153,6 +154,13 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
         assets->AddTexture("player", kaijuTex.c_str());
         assets->AddTexture("font", fontTex.c_str());
         assets->AddTexture("textBox", textBoxTex.c_str());
+=======
+
+        assets->AddTexture("player", kaijuTex.c_str());
+        assets->AddTexture("font", "assets/textures/ui/ui-font-lorez5.png");
+        assets->AddTexture("textBox", "assets/textures/ui/ui-element-bubble.png");
+        assets->AddTexture("collider","assets/textures/ColTex.png");
+>>>>>>> f449eda43f6cbd3f90508029e94741f4c2de1f9b
         
         assets->AddMusicTrack("simonZ",musicFile.c_str());