Simplified Repository interface
Added new version of specific codedsl
if should be else if
Added IConflictDectectorFactory to support new repository interface