css conflict resolved