Conflict
A conflict occurs when two independent ["ChangeSet"]s modify overlapping sections of a file in different ways. During a ["Merge"], ["Mercurial"] cannot ["Resolve"] some kinds of conflict automatically, and requires user assistance through a ["MergeProgram"].