Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 10526)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 10527)
@@ -25,4 +25,5 @@
 import javax.swing.AbstractAction;
 import javax.swing.Action;
+import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -42,5 +43,4 @@
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
-import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -117,5 +117,5 @@
     private ContextSensitiveHelpAction helpAction;
     /** the apply button */
-    private SideButton btnApply;
+    private JButton btnApply;
 
     /**
@@ -199,5 +199,5 @@
         pnlTagConflictResolver.getModel().addPropertyChangeListener(applyAction);
         pnlRelationMemberConflictResolver.getModel().addPropertyChangeListener(applyAction);
-        btnApply = new SideButton(applyAction);
+        btnApply = new JButton(applyAction);
         btnApply.setFocusable(true);
         pnl.add(btnApply);
@@ -205,9 +205,9 @@
         // -- cancel button
         CancelAction cancelAction = new CancelAction();
-        pnl.add(new SideButton(cancelAction));
+        pnl.add(new JButton(cancelAction));
 
         // -- help button
         helpAction = new ContextSensitiveHelpAction();
-        pnl.add(new SideButton(helpAction));
+        pnl.add(new JButton(helpAction));
 
         return pnl;