Adding support for a ConflictDelegate