add some sass
fix merge conflict