update styles
build site
fix merge conflicts