Comparing and merging - ediff errors