old style.scss
merge fixes