fix game
merge with game