font fix (try at least)
checkout page
merge conflict fonts @ global_styles

Conflicts:
	app/assets/stylesheets/new/global_styles.css.scss