resolve css conflict