histogram partially complete
conflict resolved after pull