# Conflicts: # Assets/Data/Cards/CardDatabase.asset # Assets/Scenes/MainMenuScene.unity # Assets/Scripts/UI/MainMenuController.cs