switched over to sass-brunch instead of styl-brunch for preprocessor
Merged conflict in config