edit css
fix merge conflict