fix extension
change sass to scss
change sass to scss
changes in templates
merge