private void mergeConflicts(TaskMonitor monitor)
			throws MemoryAccessException, CancelledException {
		try {
			mergeManager.showProgressIcon(false);
			int originalConflictOption = conflictOption;
			AddressSetView listingConflictSet = getConflicts();
			long totalAddresses = listingConflictSet.getNumAddresses();
			AddressIterator iter = listingConflictSet.getAddresses(true);
			for (int addressNum = 1; iter.hasNext(); addressNum++) {
				Address addr = iter.next();
				conflictNum = 1;
				totalConflicts = getConflictCount(addr);
				if (listingMergePanel != null) {
					conflictInfoPanel.setAddressInfo(addr, addressNum, totalAddresses);
				}
				mergeConflicts(listingMergePanel, addr, originalConflictOption, monitor);
			}
		}
		finally {
			mergeManager.showProgressIcon(true);
		}
	}
Determine the type of changes to the symbols in the LATEST and MY (CheckedOut) program.
Changes can be symbol removed, added, changed, renamed, and set to primary.
@param monitor task monitor for displaying progress to the user
@throws CancelledException if the user cancels the merge.
Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/SymbolMerger.java