@Override
	public void mergeConflicts(ListingMergePanel listingPanel, Address addr,
			int chosenConflictOption, TaskMonitor monitor)
			throws CancelledException, MemoryAccessException {
		if (!hasConflict(addr)) {
			return;
		}
		if (currentMonitor != monitor) {
			currentMonitor = monitor;
		}
		monitor.setMessage("Resolving Symbol conflicts.");
		handleRemoveConflict(listingPanel, addr, chosenConflictOption);
		handleRenameConflict(listingPanel, addr, chosenConflictOption);
//		handleCommentConflict(listingPanel, addr, chosenConflictOption);
		handleAddressConflict(listingPanel, addr, chosenConflictOption);
//		handleAddCommentConflict(listingPanel, addr, chosenConflictOption);
		handlePrimaryConflict(listingPanel, addr, chosenConflictOption);
		updateEntryPtChanges(monitor);
	}
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