modify css
solve conflict