add credit and remove sass
merge