Resolve conflict with style.scss