# Conflicts: # UOP1_Project/Assets/Scenes/Managers/PersistentManagers.unity # UOP1_Project/Assets/Scripts/Events/ScriptableObjects/LoadEventChannelSO.cs # UOP1_Project/Assets/Scripts/SaveSystem/SaveSystem.cs # UOP1_Project/Assets/Scripts/SceneManagement/LocationExit.cs # UOP1_Project/Assets/Scripts/SceneManagement/SceneLoader.cs