Class ConflictResolver