Conflicts: Assets/Prefabs/GameStateTracker.prefab Assets/Prefabs/PortableFire.prefab Assets/Prefabs/Shield.prefab Assets/game.unity
