Index: trunk/src/org/openstreetmap/josm/command/PurgeCommand.java
===================================================================
--- trunk/src/org/openstreetmap/josm/command/PurgeCommand.java	(revision 5992)
+++ trunk/src/org/openstreetmap/josm/command/PurgeCommand.java	(revision 5993)
@@ -15,4 +15,6 @@
 import javax.swing.Icon;
 
+import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -37,4 +39,6 @@
 
     protected Map<PrimitiveId, PrimitiveData> makeIncompleteData_byPrimId;
+    
+    protected final ConflictCollection purgedConflicts = new ConflictCollection();
 
     final protected DataSet ds;
@@ -76,4 +80,5 @@
         ds.beginUpdate();
         try {
+            purgedConflicts.get().clear();
             /**
              * Loop from back to front to keep referential integrity.
@@ -97,4 +102,9 @@
                 } else {
                     ds.removePrimitive(osm);
+                    Conflict<?> conflict = getLayer().getConflicts().getConflictForMy(osm);
+                    if (conflict != null) {
+                        purgedConflicts.add(conflict);
+                        getLayer().getConflicts().remove(conflict);
+                    }
                 }
             }
@@ -121,4 +131,8 @@
                 ds.addPrimitive(osm);
             }
+        }
+        
+        for (Conflict<?> conflict : purgedConflicts) {
+            getLayer().getConflicts().add(conflict);
         }
     }