Update game
Fix merge