Class ResolveMergeConflict