Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 5987)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 5988)
@@ -46,4 +46,5 @@
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -97,5 +98,9 @@
     public static CombinePrimitiveResolverDialog getInstance() {
         if (instance == null) {
-            instance = new CombinePrimitiveResolverDialog(Main.parent);
+            GuiHelper.runInEDTAndWait(new Runnable() {
+                @Override public void run() {
+                    instance = new CombinePrimitiveResolverDialog(Main.parent);
+                }
+            });
         }
         return instance;
@@ -129,12 +134,16 @@
      * @param primitive the target primitive
      */
-    public void setTargetPrimitive(OsmPrimitive primitive) {
+    public void setTargetPrimitive(final OsmPrimitive primitive) {
         this.targetPrimitive = primitive;
-        updateTitle();
-        if (primitive instanceof Way) {
-            pnlRelationMemberConflictResolver.initForWayCombining();
-        } else if (primitive instanceof Node) {
-            pnlRelationMemberConflictResolver.initForNodeMerging();
-        }
+        GuiHelper.runInEDTAndWait(new Runnable() {
+            @Override public void run() {
+                updateTitle();
+                if (primitive instanceof Way) {
+                    pnlRelationMemberConflictResolver.initForWayCombining();
+                } else if (primitive instanceof Node) {
+                    pnlRelationMemberConflictResolver.initForNodeMerging();
+                }
+            }
+        });
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 5987)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 5988)
@@ -19,4 +19,5 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.RelationToChildReference;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 
 /**
@@ -191,5 +192,9 @@
     public void refresh() {
         updateNumConflicts();
-        fireTableDataChanged();
+        GuiHelper.runInEDTAndWait(new Runnable() {
+            @Override public void run() {
+                fireTableDataChanged();
+            }
+        });
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 5987)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 5988)
@@ -15,4 +15,5 @@
 
 import org.openstreetmap.josm.data.osm.TagCollection;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -109,5 +110,9 @@
         refreshNumConflicts();
         sort();
-        fireTableDataChanged();
+        GuiHelper.runInEDTAndWait(new Runnable() {
+            @Override public void run() {
+                fireTableDataChanged();
+            }
+        });
     }
 
@@ -160,5 +165,9 @@
             }
         }
-        fireTableDataChanged();
+        GuiHelper.runInEDTAndWait(new Runnable() {
+            @Override public void run() {
+                fireTableDataChanged();
+            }
+        });
         refreshNumConflicts();
     }