Index: trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java	(revision 1560)
+++ trunk/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java	(revision 1561)
@@ -22,4 +22,5 @@
     @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
         target.deleted = other.deleted;
+        target.version = Math.max(target.version, other.version);
     }
 }
Index: trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java	(revision 1560)
+++ trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java	(revision 1561)
@@ -25,4 +25,5 @@
             ((Node)target).coor = ((Node)other).coor;
             ((Node)target).eastNorth = ((Node)other).eastNorth;
+            target.version = Math.max(target.version, other.version);
         }
     }
Index: trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java	(revision 1560)
+++ trunk/src/org/openstreetmap/josm/data/conflict/PropertyConflict.java	(revision 1561)
@@ -28,4 +28,5 @@
     @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
         target.put(key, other.get(key));
+        target.version = Math.max(target.version, other.version);
     }
 }