Error fix
Merge conflict on Game Manager