[Bug 401314] New: empty conflict to confirm