game class modifications
game merge