master and player button's font and size hanged
game over screen changed
merge fixed