correct gulp-sass inclusion
Fix conflicts