Merge Fixing

Assets/Scripts/BackgroundInstance.cs

Assets/Scripts/BackgroundInstance.cs.meta

Assets/Scripts/BackgroundRoller.cs

Assets/Scripts/BackgroundRoller.cs.meta

Assets/Scripts/Bosses/EnemySpawnController.cs.meta

Assets/Scripts/Camera/BackgroundInstance.cs.meta

Assets/Scripts/Camera/BackgroundRoller.cs.meta

Assets/Scripts/Camera/CameraController.cs.meta

Assets/Scripts/Camera/FellOffController.cs.meta

Assets/Scripts/Camera/Main_camera.cs

Assets/Scripts/Camera/Main_camera.cs.meta

Assets/Scripts/CameraController.cs

Assets/Scripts/CameraController.cs.meta

Assets/Scripts/EnemySpawnController.cs

Assets/Scripts/EnemySpawnController.cs.meta

Assets/Scripts/FellOffController.cs

Assets/Scripts/FellOffController.cs.meta

Assets/Scripts/ItemDestroyer.cs

Assets/Scripts/ItemDestroyer.cs.meta

Assets/Scripts/ItemSpawner.cs