Index: /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 3972)
+++ /trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java	(revision 3973)
@@ -16,4 +16,5 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
@@ -201,5 +202,8 @@
                 sel = getCurrentDataSet().getSelected();
             } else if (mode.equals("conflict")) {
-                if (Main.map.conflictDialog.getConflicts() != null) {
+                Conflict<? extends OsmPrimitive> c = Main.map.conflictDialog.getSelectedConflict();
+                if (c != null) {
+                    sel.add(c.getMy());
+                } else if (Main.map.conflictDialog.getConflicts() != null) {
                     sel = Main.map.conflictDialog.getConflicts().getMyConflictParties();
                 }
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 3972)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 3973)
@@ -236,4 +236,18 @@
     }
 
+    /**
+     * returns the first selected item of the conflicts list
+     * 
+     * @return Conflict
+     */
+    public Conflict<? extends OsmPrimitive> getSelectedConflict() {
+        if (conflicts == null || model.getSize() == 0) return null;
+
+        int index = lstConflicts.getSelectedIndex();
+        if (index < 0) return null;
+
+        return conflicts.get(index);
+    }
+
     public void onConflictsAdded(ConflictCollection conflicts) {
         refreshView();