fixed conflict in game1