Index: src/org/openstreetmap/josm/command/ConflictResolveCommand.java
===================================================================
--- src/org/openstreetmap/josm/command/ConflictResolveCommand.java	(revision 113)
+++ src/org/openstreetmap/josm/command/ConflictResolveCommand.java	(revision 114)
@@ -75,5 +75,5 @@
 			if (c.resolution != null)
 				i++;
-		return new DefaultMutableTreeNode(new JLabel(tr("Resolve {0} conflicts in {1} objects",i,resolved.size()), ImageProvider.get("data", "primitive"), JLabel.HORIZONTAL));
+		return new DefaultMutableTreeNode(new JLabel(tr("Resolve {0} conflicts in {1} objects",i,resolved.size()), ImageProvider.get("data", "object"), JLabel.HORIZONTAL));
     }
 }