fixed css conflict