Conflict Checker

Conflict checking is finished.

We are still trying to implement repeat runs and record keeping.