Index: /home/frsantos/Proyectos/JOSM/core/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- /home/frsantos/Proyectos/JOSM/core/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 265)
+++ /home/frsantos/Proyectos/JOSM/core/src/org/openstreetmap/josm/actions/CombineWayAction.java	(working copy)
@@ -55,6 +55,9 @@
 			return;
 		}
 
+		Way oldWay = selectedWays.poll();
+		Way newWay = new Way(oldWay);
+
 		// collect properties for later conflict resolving
 		Map<String, Set<String>> props = new TreeMap<String, Set<String>>();
 		for (Way w : selectedWays) {
@@ -62,11 +65,10 @@
 				if (!props.containsKey(e.getKey()))
 					props.put(e.getKey(), new TreeSet<String>());
 				props.get(e.getKey()).add(e.getValue());
+				newWay.put(e.getKey(), e.getValue());
 			}
 		}
 		
-		Way oldWay = selectedWays.poll();
-		Way newWay = new Way(oldWay);
 		LinkedList<Command> cmds = new LinkedList<Command>();
 		
 		for (Way w : selectedWays)