lose spurious change in zdiff.1 from merge