Index: trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 2407)
+++ trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 2417)
@@ -553,6 +553,4 @@
         their.addPrimitive(n5);
 
-        their.addPrimitive(n5);
-
         Node n4 = new Node(new LatLon(2,2));
         n4.setOsmId(2,2);
@@ -586,5 +584,5 @@
      * their way has a higher version and different nodes. My way is modified.
      *
-     * => merge it onto my way not possbile, conflict
+     * => merge onto my way not possible, create a conflict
      *
      */
@@ -621,6 +619,4 @@
         Node n5 = new Node(new LatLon(1,1));
         n5.setOsmId(4,1);
-        their.addPrimitive(n5);
-
         their.addPrimitive(n5);
 
@@ -788,5 +784,6 @@
         theirWay.addNode(n3);
         theirWay.addNode(n4);
-        theirWay.setUser(User.createOsmUser(1111, "their"));
+        User user = User.createOsmUser(1111, "their");
+        theirWay.setUser(user);
         theirWay.setTimestamp(new Date());
         their.addPrimitive(theirWay);
@@ -797,5 +794,4 @@
         assertEquals(0,visitor.getConflicts().size());
         assertEquals("their", myWay.getUser().getName());
-        assertEquals(1111, myWay.getUser().getId());
         assertEquals(1111, myWay.getUser().getId());
         assertEquals(theirWay.getTimestamp(), myWay.getTimestamp());