Some work on the game manager.
Fix merge conflict.