css conflict handling