Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 1781)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 1782)
@@ -110,12 +110,12 @@
     protected JPanel buildButtonRow() {
         JPanel pnl = new JPanel();
-        pnl.setLayout(new FlowLayout(FlowLayout.RIGHT));
-
-        JButton btn = new JButton(new CancelAction());
+        pnl.setLayout(new FlowLayout(FlowLayout.CENTER));
+
+        JButton btn = new JButton(new ApplyResolutionAction());
+        btn.setName("button.apply");
+        pnl.add(btn);
+
+        btn = new JButton(new CancelAction());
         btn.setName("button.cancel");
-        pnl.add(btn);
-
-        btn = new JButton(new ApplyResolutionAction());
-        btn.setName("button.apply");
         pnl.add(btn);