Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 7673)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 7674)
@@ -113,8 +113,8 @@
     private AutoAdjustingSplitPane spTagConflictTypes;
     private TagConflictResolver pnlTagConflictResolver;
-    private RelationMemberConflictResolver pnlRelationMemberConflictResolver;
+    protected RelationMemberConflictResolver pnlRelationMemberConflictResolver;
     private boolean canceled;
     private JPanel pnlButtons;
-    private OsmPrimitive targetPrimitive;
+    protected OsmPrimitive targetPrimitive;
 
     /** the private help action */
@@ -191,9 +191,13 @@
     }
 
+    protected ApplyAction buildApplyAction() {
+        return new ApplyAction();
+    }
+
     protected JPanel buildButtonPanel() {
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
 
         // -- apply button
-        ApplyAction applyAction = new ApplyAction();
+        ApplyAction applyAction = buildApplyAction();
         pnlTagConflictResolver.getModel().addPropertyChangeListener(applyAction);
         pnlRelationMemberConflictResolver.getModel().addPropertyChangeListener(applyAction);
@@ -295,7 +299,5 @@
 
     protected void prepareDefaultTagDecisions() {
-        TagConflictResolverModel model = getTagConflictResolverModel();
-        model.prepareDefaultTagDecisions();
-        model.rebuild();
+        getTagConflictResolverModel().prepareDefaultTagDecisions();
     }
 
@@ -417,5 +419,5 @@
     }
 
-    class ApplyAction extends AbstractAction implements PropertyChangeListener {
+    protected class ApplyAction extends AbstractAction implements PropertyChangeListener {
 
         public ApplyAction() {