Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 12352)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 12353)
@@ -152,5 +152,4 @@
     public void showNotify() {
         Main.getLayerManager().addAndFireActiveLayerChangeListener(this);
-        refreshView();
     }
 
@@ -158,6 +157,5 @@
     public void hideNotify() {
         Main.getLayerManager().removeActiveLayerChangeListener(this);
-        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
-        removeEditLayerListeners(editLayer);
+        removeEditLayerListeners(Main.getLayerManager().getEditLayer());
     }