Use the new CoveringView API in MergeConflict.