Index: /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java	(revision 34055)
+++ /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java	(revision 34056)
@@ -389,5 +389,5 @@
         deletes.remove(targetWay);
 
-        cmds.add(new ChangeCommand(targetWay, modifiedTargetWay));
+        cmds.add(new ChangeCommand(getLayerManager().getEditDataSet(), targetWay, modifiedTargetWay));
         cmds.addAll(dialog.buildWayResolutionCommands());
         dialog.buildRelationCorrespondance(newRelations, oldWays);
Index: /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java
===================================================================
--- /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java	(revision 34055)
+++ /applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java	(revision 34056)
@@ -8,6 +8,4 @@
 import java.util.Map;
 
-import javax.swing.JPanel;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -18,5 +16,5 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
-import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolver;
+import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolverModel;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 
@@ -58,5 +56,5 @@
      */
     public MyCombinePrimitiveResolverDialog(Component parent) {
-        super(parent);
+        super(parent, new TagConflictResolverModel(), new MyRelationMemberConflictResolverModel());
     }
 
@@ -71,10 +69,4 @@
         }
         return instance;
-    }
-
-    @Override
-    protected JPanel buildRelationMemberConflictResolverPanel() {
-        pnlRelationMemberConflictResolver = new RelationMemberConflictResolver(new MyRelationMemberConflictResolverModel());
-        return pnlRelationMemberConflictResolver;
     }