add new font, fix form page
fix merge conflict