fixed gameover and win at the same time
merging gameover fix