[Bug 297795] New: "Ignore this conflict of ..." doesn't work