[Bug 401314] empty conflict to confirm