Closed ArokhSlade closed 1 week ago
the only conflict is in miguel's and my level.tscn, i.e. the level scene. i will make it so both are preserved, (level.tscn from development, and level_arokh.tscn from my branch).
then i will go into godot and work to unify both level scenes into one that has both our features in it. and then do another PR for that.