remove merge conflicts and add web-fonts.scss to master