Index: /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 9547)
+++ /trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 9548)
@@ -50,5 +50,5 @@
     protected final void build() {
         setLayout(new GridBagLayout());
-        JPanel pnl = new JPanel(new BorderLayout());
+        final JPanel pnl = new JPanel(new BorderLayout());
         pnl.add(lblHeader = new JMultilineLabel(""));
         GridBagConstraints gc = new GridBagConstraints();
@@ -64,11 +64,13 @@
         gc.insets = new Insets(0, 0, 0, 0);
         add(new JScrollPane(tblResolver = new RelationMemberConflictResolverTable(model)), gc);
-        pnl = new JPanel(new BoxLayout(pnl, BoxLayout.Y_AXIS));
-        pnl.add(buildRoleEditingPanel());
-        pnl.add(buildTagRelationsPanel());
+
+        final JPanel pnl2 = new JPanel();
+        pnl2.setLayout(new BoxLayout(pnl2, BoxLayout.Y_AXIS));
+        pnl2.add(buildRoleEditingPanel());
+        pnl2.add(buildTagRelationsPanel());
         gc.gridy = 2;
         gc.weighty = 0.0;
         gc.fill = GridBagConstraints.HORIZONTAL;
-        add(pnl, gc);
+        add(pnl2, gc);
     }
 
Index: /trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTest.java	(revision 9548)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTest.java	(revision 9548)
@@ -0,0 +1,30 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.conflict.tags;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Unit tests of {@link RelationMemberConflictResolver} class.
+ */
+public class RelationMemberConflictResolverTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void init() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
+
+    /**
+     * Unit test for {@link RelationMemberConflictResolver#RelationMemberConflictResolver}.
+     */
+    @Test
+    public void testRelationMemberConflictResolver() {
+        assertNotNull(new RelationMemberConflictResolver(null));
+    }
+}