Fix lost string in merge; make comparison diff easier to understand
Fix lost string in merge; make comparison diff easier to understand

cellcounter/cellcounter,cellcounter/cellcounter,cellcounter/cellcounter,cellcounter/cellcounter