css conflict fix