Conflict checking

The answer to the second last question.