Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 17462)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 17464)
@@ -1107,4 +1107,5 @@
             store.clear();
             allPrimitives.clear();
+            conflicts.get().clear();
         });
     }