Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 2078)
+++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 2079)
@@ -138,5 +138,5 @@
         //
         TagCollection wayTags = TagCollection.unionOfAllPrimitives(ways);
-        completeTagCollectionWithMissingTags(wayTags, ways);
+
 
         // try to build a new way out of the combination of ways
@@ -163,6 +163,9 @@
         modifiedTargetWay.setNodes(path);
 
+        TagCollection completeWayTags = new TagCollection(wayTags);
+        completeTagCollectionWithMissingTags(completeWayTags, ways);
+
         CombineWaysConflictResolverDialog dialog = CombineWaysConflictResolverDialog.getInstance();
-        dialog.getTagConflictResolverModel().populate(wayTags);
+        dialog.getTagConflictResolverModel().populate(completeWayTags);
         dialog.setTargetWay(targetWay);
         dialog.getRelationMemberConflictResolverModel().populate(