Index: /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 3765)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 3766)
@@ -335,5 +335,5 @@
                 tr("Merging deleted primitives failed"),
                 JOptionPane.WARNING_MESSAGE,
-                HelpUtil.ht("/Dialog/ConflictResolution#MergingDeletedPrimitivesFailed")
+                HelpUtil.ht("/Dialog/Conflict#MergingDeletedPrimitivesFailed")
         );
     }