Second Problem Fixed

Ian, <u>if</u> you read this, we fixed the second error
where the conflict checker sometimes fails.