fix font-styles merge conflict

fix minor merge conflict