mark changes
fix merge conflicts
applied font changes to css