Font face is updated on Mac.
Conflicts are fixed.