private ConflictPanel createConflictPanel() {
		ChangeListener changeListener = new ChangeListener() {
			@Override
			public void stateChanged(ChangeEvent e) {
				mergeManager.clearStatusText();
				mergeManager.setApplyEnabled(true);
			}
		};

		conflictPanel = new ConflictPanel(changeListener);
		Dimension d = conflictPanel.getPreferredSize();
		conflictPanel.setPreferredSize(new Dimension(400, d.height));
		return conflictPanel;
	}
Update the panel with conflict information.
@param info info to show conflict information
@param conflictIndex conflict #n
Ghidra/Features/Base/src/main/java/ghidra/app/merge/propertylist/PropertyListMergePanel.java