Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 13360)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 13367)
@@ -208,5 +208,9 @@
             dialog.showDialog();
 
-            lstConflicts.setSelectedIndex(index);
+            if (index < conflicts.size() - 1) {
+                lstConflicts.setSelectedIndex(index);
+            } else {
+                lstConflicts.setSelectedIndex(index - 1);
+            }
         }
         MainApplication.getMap().mapView.repaint();
@@ -304,5 +308,5 @@
         int index = lstConflicts.getSelectedIndex();
 
-        return index >= 0 ? conflicts.get(index) : null;
+        return index >= 0 && index < conflicts.size() ? conflicts.get(index) : null;
     }