Index: applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java
===================================================================
--- applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java	(revision 29778)
+++ applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java	(revision 29854)
@@ -695,8 +695,8 @@
 		}
 	}
-
+/*
 	private Way getOld(Way r) {
 		return getOld(r, oldWays);
-	}
+	}*/
 
 	public static Way getOld(Way w, Map<Way, Way> oldWays) {
Index: applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java
===================================================================
--- applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java	(revision 29778)
+++ applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java	(revision 29854)
@@ -173,5 +173,5 @@
     protected void updateTitle() {
         if (targetPrimitive == null) {
-            setTitle(tr("Conflicts when combining primitives", null));
+            setTitle(tr("Conflicts when combining primitives"));
             return;
         }