Introduce ConflictDetection
utility class
#478
Merged
ConflictDetection
utility class
#478