Implement hasConflicts.
Implement conflict enumeration.

Also added in a stop paramater to the block.