label percentages
merge conflics