Merge base.scss into global.scss