Changes to GameClient
Fixed merge error in Level