fix font
fix conflict