fixed css conflict after merge