game over screen ready
merge fixed