fixed the damn fonts again....
fixed merge conflicts.