Css conflict fix