Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 733)
+++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 734)
@@ -171,10 +171,17 @@
 				newWay.put(e.getKey(), combined);
 			} else if (e.getValue().size() > 1) {
-				JComboBox c = new JComboBox(e.getValue().toArray());
-				c.setEditable(true);
-				p.add(new JLabel(e.getKey()), GBC.std());
-				p.add(Box.createHorizontalStrut(10), GBC.std());
-				p.add(c, GBC.eol());
-				components.put(e.getKey(), c);
+				if("created_by".equals(e.getKey()))
+				{
+					newWay.put("created_by", "JOSM");
+				}
+				else
+				{
+					JComboBox c = new JComboBox(e.getValue().toArray());
+					c.setEditable(true);
+					p.add(new JLabel(e.getKey()), GBC.std());
+					p.add(Box.createHorizontalStrut(10), GBC.std());
+					p.add(c, GBC.eol());
+					components.put(e.getKey(), c);
+				}
 			} else
 				newWay.put(e.getKey(), e.getValue().iterator().next());
Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java	(revision 733)
+++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java	(revision 734)
@@ -171,10 +171,17 @@
 				newNode.put(e.getKey(), combined);
 			} else if (e.getValue().size() > 1) {
-				JComboBox c = new JComboBox(e.getValue().toArray());
-				c.setEditable(true);
-				p.add(new JLabel(e.getKey()), GBC.std());
-				p.add(Box.createHorizontalStrut(10), GBC.std());
-				p.add(c, GBC.eol());
-				components.put(e.getKey(), c);
+				if("created_by".equals(e.getKey()))
+				{
+					newNode.put("created_by", "JOSM");
+				}
+				else
+				{
+					JComboBox c = new JComboBox(e.getValue().toArray());
+					c.setEditable(true);
+					p.add(new JLabel(e.getKey()), GBC.std());
+					p.add(Box.createHorizontalStrut(10), GBC.std());
+					p.add(c, GBC.eol());
+					components.put(e.getKey(), c);
+				}
 			} else
 				newNode.put(e.getKey(), e.getValue().iterator().next());