Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 3057)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 3058)
@@ -151,4 +151,5 @@
         lstConflicts.setSelectedIndex(index);
 
+        refreshView();
         Main.map.mapView.repaint();
     }
@@ -240,4 +241,5 @@
 
     public void onConflictsRemoved(ConflictCollection conflicts) {
+        System.err.println("1 conflict has been resolved.");
         refreshView();
     }