fix font
merge