stage and css
fix merge conflicts