add sassconf assets
merge conflicts