Resolved conflicts

src/gameplay/beat_system.hpp

@@ -11,7 +11,7 @@ namespace phase_shifter::gameplay {
 		float time_to_beat    = 0.f;
 		float avg_beat_time   = 1.f;
 
-		int beats_left = 999.f;
+		int beats_left = 999;
 	};
 
 	// TODO: replace placeholder logic with actual beat detection

src/meta_system.cpp

@@ -93,11 +93,7 @@ namespace phase_shifter {
 		        .position(glm::rotate(sun_dir, glm::vec3(0, 0, 1)) * 40.f)
 		        .create();
 
-<<<<<<< HEAD
-=======
-
 		_level_system->load("dummy");
->>>>>>> develop
 	}
 
 	Meta_system::~Meta_system()