Convert custom.css.scss to Sass styling
Fix merge conflict