ediff changes