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