# Conflicts: # Assets/01_Scenes/blackjack.unity # Assets/01_Scenes/blackjack/NavMesh-Terrain 2.asset # Assets/01_Scenes/blackjack/NavMesh-Terrain 2.asset.meta # Assets/02_Scripts/Blackjack/HookWalkToTable.cs # Assets/04_Models/Blackjack/anim/HookAnimatorController.controller