wip on font presentation
conflict resolution merge