added font size
fixed merge