Index: /src/org/openstreetmap/josm/gui/ConflictResolver.java
===================================================================
--- /src/org/openstreetmap/josm/gui/ConflictResolver.java	(revision 187)
+++ /src/org/openstreetmap/josm/gui/ConflictResolver.java	(revision 188)
@@ -12,5 +12,4 @@
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
@@ -23,4 +22,5 @@
 import javax.swing.JButton;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -34,4 +34,5 @@
 import javax.swing.table.TableModel;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.ConflictItem;
 import org.openstreetmap.josm.data.conflict.DeleteConflict;
@@ -160,6 +161,15 @@
 		}
 		
-		if (this.conflicts.isEmpty())
-			throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray()));
+		if (this.conflicts.isEmpty()) {
+			JOptionPane.showMessageDialog(Main.parent,
+					"The ConflictResolver and the Merger disagree about conflicts in your dataset.\n"+
+					"Of course, this is a bug.\n"+
+					"The bug is very old, but unfortunatly, Imi (programmer) was not able to catch it.\n"+
+					"If you know exactly what bounding boxes you downloaded (bookmarks?) and/or what\n"+
+					"files you opened (have them ready?) to display this message again, pretty please\n"+
+					"inform Imi at josm@eigenheimstrasse.de about the details.\n"+
+					"Thanks.");
+			//throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray()));
+		}
 
 		// have to initialize the JTables here and not in the declaration, because its constructor