Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 3764)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 3765)
@@ -259,5 +259,5 @@
     @Override
     public String helpTopic() {
-        return ht("/Dialogs/ConflictListDialog");
+        return ht("/Dialog/ConflictList");
     }
 
@@ -328,5 +328,5 @@
             putValue(SHORT_DESCRIPTION,  tr("Open a merge dialog of all selected items in the list above."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "conflict"));
-            putValue("help", ht("/Dialogs/ConflictListDialog#ResolveAction"));
+            putValue("help", ht("/Dialog/ConflictList#ResolveAction"));
         }
 
@@ -348,5 +348,5 @@
             putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
             putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
-            putValue("help", ht("/Dialogs/ConflictListDialog#SelectAction"));
+            putValue("help", ht("/Dialog/ConflictList#SelectAction"));
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 3764)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 3765)
@@ -170,5 +170,5 @@
 
         resolver.addPropertyChangeListener(this);
-        HelpUtil.setHelpContext(this.getRootPane(), "Dialog/ConflictDialog");
+        HelpUtil.setHelpContext(this.getRootPane(), ht("Dialog/Conflict"));
 
         registerListeners();
@@ -212,5 +212,5 @@
 
         public void actionPerformed(ActionEvent arg0) {
-            HelpBrowser.setUrlForHelpTopic("/Dialog/ConflictDialog");
+            HelpBrowser.setUrlForHelpTopic(ht("/Dialog/Conflict"));
         }
     }