small change to font
fixed merges