Index: /applications/editors/josm/plugins/opendata/build.xml
===================================================================
--- /applications/editors/josm/plugins/opendata/build.xml	(revision 33196)
+++ /applications/editors/josm/plugins/opendata/build.xml	(revision 33197)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="11606"/>
+    <property name="plugin.main.version" value="11772"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>
Index: /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java
===================================================================
--- /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java	(revision 33196)
+++ /applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/datasets/WayCombiner.java	(revision 33197)
@@ -14,4 +14,5 @@
 import java.util.Set;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.CombineWayAction.NodeGraph;
 import org.openstreetmap.josm.command.Command;
@@ -131,5 +132,5 @@
         completeTagCollectionForEditing(tagsToEdit);
 
-        CombinePrimitiveResolverDialog dialog = CombinePrimitiveResolverDialog.getInstance();
+        CombinePrimitiveResolverDialog dialog = new CombinePrimitiveResolverDialog(Main.parent);
         dialog.getTagConflictResolverModel().populate(tagsToEdit, completeWayTags.getKeysWithMultipleValues());
         dialog.setTargetPrimitive(targetWay);