added new game
fix merge