change font size
resolved conflict