Comment 1 for bug 447754

We also have bug 448019, which is really easy to fix. I think it'll massively shorten our response time to these conflicts, and so vastly reduce the number of log messages. The extra bit of intelligence proposed here may turn out to be unnecessary.