fix game
fix merge