add font families section
fix merge conflicts
fix merge errors
fix merge conflicts