Revision of ConflictFindingService