Index: test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
===================================================================
--- test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 211)
+++ test/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java	(revision 224)
@@ -25,5 +25,5 @@
 		ds = new DataSet();
 		dsNode = DataSetTestCaseHelper.createNode(ds);
-		v = new MergeVisitor(ds);
+		v = new MergeVisitor(ds, null);
 		n = DataSetTestCaseHelper.createNode(null);
 	}
@@ -235,5 +235,5 @@
 
 		Segment ls2 = DataSetTestCaseHelper.createSegment(ds, n2[0], n2[1]);
-		v = new MergeVisitor(ds);
+		v = new MergeVisitor(ds, null);
 		for (OsmPrimitive osm : ds2.allPrimitives())
 			osm.visit(v);
@@ -249,5 +249,5 @@
 		Segment s = DataSetTestCaseHelper.createSegment(ds, n[0], n[1]);
 		Way w = DataSetTestCaseHelper.createWay(ds, s);
-		MergeVisitor v = new MergeVisitor(ds);
+		MergeVisitor v = new MergeVisitor(ds, null);
 		v.visit(n[0]);
 		v.visit(n[1]);
@@ -281,5 +281,5 @@
 		w.id = 42;
 		// merge both
-		MergeVisitor v = new MergeVisitor(ds);
+		MergeVisitor v = new MergeVisitor(ds, null);
 		v.visit(w);
 		v.fixReferences();
@@ -299,5 +299,5 @@
 		s.timestamp = new Date(new Date().getTime()+1);
 		
-		MergeVisitor v = new MergeVisitor(ds);
+		MergeVisitor v = new MergeVisitor(ds, null);
 		v.visit(s);
 		v.fixReferences();
@@ -308,5 +308,5 @@
 	public void testMergeIncompleteSegmentsAddToDataSet() throws Exception {
 		DataSet ds = new DataSet();
-		MergeVisitor v = new MergeVisitor(ds);
+		MergeVisitor v = new MergeVisitor(ds, null);
 		v.visit(createSegment(null, true, false, 1));
 		assertEquals(1, ds.segments.size());
@@ -330,5 +330,5 @@
 		newNode.timestamp = new Date(date.getTime());
 		
-		MergeVisitor v = new MergeVisitor(ds);
+		MergeVisitor v = new MergeVisitor(ds, null);
 		v.visit(newNode);
 
@@ -343,5 +343,5 @@
 		Segment s2 = new Segment(42);
 		
-		MergeVisitor v = new MergeVisitor(ds);
+		MergeVisitor v = new MergeVisitor(ds, null);
 		v.visit(s1);
 		v.visit(s2);