resolve css conflict - part2