Resolved css conflict