modify css
fix conflict