The conflict resolution feature helps you quickly resolve inconsistencies that result from someone else uploading or making online changes to the same campaign that you are working on in Microsoft Advertising Editor.