fixed up game
for merge
for merge