added ConflictDetector class