merge-tree: fix typo in "both changed identically"