Index: trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 3034)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java	(revision 3053)
@@ -292,7 +292,6 @@
     /**
      * My and their node are new but semantically equal. My node is deleted.
-     *
-     * => create a conflict
-     *
+     * 
+     * => Ignore my node, no conflict
      */
     @Test
@@ -309,5 +308,5 @@
         visitor.merge();
 
-        assertEquals(1,visitor.getConflicts().size());
+        assertEquals(0, visitor.getConflicts().size());
         assertTrue(n.getDataSet() == my);
         assertTrue(n1.getDataSet() == their);