Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java	(revision 5298)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java	(revision 5299)
@@ -93,4 +93,6 @@
         setBackground(ConflictColors.BGCOLOR.get());
         setForeground(ConflictColors.FGCOLOR.get());
+        setBorder(null);
+        setIcon(null);
         setToolTipText(null);
     }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java	(revision 5298)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java	(revision 5299)
@@ -153,29 +153,22 @@
         RelationMember member = (RelationMember)value;
         reset();
-        if (value == null)
-            return this;
-
-        renderBackground(getModel(table), member, row, column, isSelected);
-        renderForeground(getModel(table), member, row, column, isSelected);
-        switch(column) {
-        case 0:
-            renderRowId(row);
-            break;
-        case 1:
-            if (member == null) {
-                renderEmptyRow();
-            } else {
+        if (member == null) {
+            renderEmptyRow();
+        } else {
+            renderBackground(getModel(table), member, row, column, isSelected);
+            renderForeground(getModel(table), member, row, column, isSelected);
+            switch(column) {
+            case 0:
+                renderRowId(row);
+                break;
+            case 1:
                 renderRole(member);
+                break;
+            case 2:
+                renderPrimitive(member);
+                break;
+            default:
+                // should not happen
             }
-            break;
-        case 2:
-            if (member == null) {
-                renderEmptyRow();
-            } else {
-                renderPrimitive(member);
-            }
-            break;
-        default:
-            // should not happen
         }
         return this;
Index: trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 5298)
+++ trunk/test/unit/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModelTest.java	(revision 5299)
@@ -84,5 +84,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         model.copyMyToTop(new int[]{0});
 
@@ -108,5 +108,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
 
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
@@ -135,5 +135,5 @@
 
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
 
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
@@ -161,5 +161,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
 
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
@@ -188,5 +188,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         model.copyMyToEnd(new int[]{0});
 
@@ -209,5 +209,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
 
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
@@ -235,5 +235,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
 
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
@@ -263,5 +263,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
 
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
@@ -294,5 +294,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -322,5 +322,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -350,5 +350,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -383,5 +383,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -412,5 +412,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -442,5 +442,5 @@
         Way theirWay = their.addWay(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -474,5 +474,5 @@
         Way theirWay = new Way(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -500,5 +500,5 @@
         Way theirWay = new Way(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -530,5 +530,5 @@
         Way theirWay = new Way(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -563,5 +563,5 @@
         Way theirWay = new Way(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -589,5 +589,5 @@
         Way theirWay = new Way(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));
@@ -619,5 +619,5 @@
         Way theirWay = new Way(1);
 
-        model.populate(myWay, theirWay);
+        model.populate(myWay, theirWay, null);
         List<Node> mergedNodes = inspectNodeList(model, "Merged");
         mergedNodes.add(new Node(10));