Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 12177)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 12178)
@@ -505,5 +505,4 @@
             Main.main.undoRedo.add(new SequenceCommand(name, commands));
             refreshView();
-            Main.map.mapView.repaint();
         }
     }