Class ConflictMerger