fonts and inline edit
merge