Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 1116)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 1117)
@@ -127,5 +127,8 @@
 			if (osm instanceof Way)
 				model.addElement(osm);
-	}
+        for (OsmPrimitive osm : this.conflicts.keySet())
+            if (osm instanceof Relation)
+                model.addElement(osm);
+    }
 
 	public final void add(Map<OsmPrimitive, OsmPrimitive> conflicts) {