added gameOver
merging