diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalAddConflictPanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalAddConflictPanel.java
index a838636a51..9ffe455eb2 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalAddConflictPanel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/listing/ExternalAddConflictPanel.java
@@ -27,6 +27,7 @@ import docking.widgets.fieldpanel.FieldPanel;
 import docking.widgets.fieldpanel.internal.FieldPanelCoordinator;
 import docking.widgets.label.GIconLabel;
 import generic.theme.GIcon;
+import ghidra.GhidraOptions;
 import ghidra.app.merge.MergeConstants;
 import ghidra.app.merge.MergeManager;
 import ghidra.app.merge.util.ConflictCountPanel;
@@ -49,7 +50,7 @@ import ghidra.program.model.symbol.ExternalLocation;
 import resources.icons.EmptyIcon;
 
 /**
- * Panel to select a data type in order to resolve an add conflict in the multi-user 
+ * Panel to select a data type in order to resolve an add conflict in the multi-user
  * external location merger.
  */
 class ExternalAddConflictPanel extends JPanel implements CodeFormatService {
@@ -90,7 +91,6 @@ class ExternalAddConflictPanel extends JPanel implements CodeFormatService {
 
 	ExternalAddConflictPanel(MergeManager mergeManager, int totalConflicts, Program latestProgram,
 			Program myProgram, boolean showListingPanel) {
-		super();
 		this.tool = mergeManager.getMergeTool();
 		this.mergeManager = mergeManager;
 		this.totalConflicts = totalConflicts;
@@ -168,7 +168,7 @@ class ExternalAddConflictPanel extends JPanel implements CodeFormatService {
 	}
 
 	private ToolOptions getFieldOptions() {
-		ToolOptions fieldOptions = new ToolOptions("field");
+		ToolOptions fieldOptions = new ToolOptions(GhidraOptions.CATEGORY_BROWSER_FIELDS);
 		fieldOptions.setBoolean(RegisterFieldFactory.DISPLAY_HIDDEN_REGISTERS_OPTION_NAME, true);
 		return fieldOptions;
 	}
@@ -310,7 +310,7 @@ class ExternalAddConflictPanel extends JPanel implements CodeFormatService {
 	}
 
 	/**
-	 * Add the latest program's listing model as a listener to the latest program 
+	 * Add the latest program's listing model as a listener to the latest program
 	 * for domain object events.
 	 */
 	public void addDomainObjectListener() {
@@ -319,7 +319,7 @@ class ExternalAddConflictPanel extends JPanel implements CodeFormatService {
 	}
 
 	/**
-	 * Remove the latest program's listing model as a listener to the latest program 
+	 * Remove the latest program's listing model as a listener to the latest program
 	 * for domain object events.
 	 */
 	public void removeDomainObjectListener() {
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanel.java
index 4d31877284..bf39ad664f 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/merge/tool/ListingMergePanel.java
@@ -29,6 +29,7 @@ import docking.widgets.fieldpanel.FieldPanel;
 import docking.widgets.fieldpanel.internal.FieldPanelCoordinator;
 import docking.widgets.fieldpanel.support.BackgroundColorModel;
 import generic.theme.GIcon;
+import ghidra.GhidraOptions;
 import ghidra.app.merge.MergeConstants;
 import ghidra.app.nav.Navigatable;
 import ghidra.app.plugin.core.codebrowser.hover.*;
@@ -149,7 +150,7 @@ public class ListingMergePanel extends JPanel
 	}
 
 	private ToolOptions getFieldOptions() {
-		ToolOptions fieldOptions = new ToolOptions("field");
+		ToolOptions fieldOptions = new ToolOptions(GhidraOptions.CATEGORY_BROWSER_FIELDS);
 		fieldOptions.setBoolean(RegisterFieldFactory.DISPLAY_HIDDEN_REGISTERS_OPTION_NAME, true);
 		return fieldOptions;
 	}
@@ -382,7 +383,7 @@ public class ListingMergePanel extends JPanel
 	}
 
 	/**
-	 * Add the result program's listing model as a listener to the result program 
+	 * Add the result program's listing model as a listener to the result program
 	 * for domain object events.
 	 */
 	public void addDomainObjectListener() {
@@ -391,7 +392,7 @@ public class ListingMergePanel extends JPanel
 	}
 
 	/**
-	 * Remove the result program's listing model as a listener to the result program 
+	 * Remove the result program's listing model as a listener to the result program
 	 * for domain object events.
 	 */
 	public void removeDomainObjectListener() {