private void showMergePanel(final ConflictInfo info, final int conflictIndex,
			final int totalNumConflicts) {
		try {
			SwingUtilities.invokeAndWait(new Runnable() {
				@Override
				public void run() {
					if (mergePanel == null) {
						mergePanel = new PropertyListMergePanel(mergeManager, totalNumConflicts);
					}
					mergePanel.setConflictInfo(conflictIndex, info);
				}
			});
		}
		catch (InterruptedException e) {
		}
		catch (InvocationTargetException e) {
		}
		mergeManager.setApplyEnabled(false);
		mergeManager.showComponent(mergePanel, "PropertyListMerge", new HelpLocation(
			HelpTopics.REPOSITORY, "PropertyListConflict"));
		// block until the user either cancels or hits the "Apply" button
		// on the merge dialog...
		// when the "Apply" button is hit, get the user's selection
		// and continue.
	}
The property was not in the latest program; if the value changed
from the original, set the value in the result program.
@param myList property list from source program
@param resultList property list from result program
@param origList property list from the original checked out program
@param propertyName name of the property
Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergeManager.java