Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 5089)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 5090)
@@ -82,6 +82,5 @@
     @Override
     public int getRowCount() {
-        if (decisions == null) return 0;
-        return decisions.size();
+        return getNumDecisions();
     }
 
@@ -184,5 +183,5 @@
      */
     public int getNumDecisions() {
-        return  getRowCount();
+        return decisions == null ? 0 : decisions.size();
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 5089)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 5090)
@@ -179,5 +179,5 @@
 
     public int getNumDecisions() {
-        return getRowCount();
+        return decisions == null ? 0 : decisions.size();
     }