fixing things for game
fixing merge