fixed gameover
merge