update css
remove conflict