Resolve css conflict?