merge: detect delete/modechange conflict