fixed
merge js/scss files in default template