fix font issue
fix conflict