added scss package dependecy and test
fix merge conflict
fix merge conflict