fix css
fix merge conflict