Conflict resolution icons

When the synchronization process encounters a conflict, the possible resolutions display as icons. Select the icon for the resolution you want to (for example, "Ignore" or "Update Remote"). Hover over the icon to view a brief description of the action that can be taken by an icon.