Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 7585)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 7586)
@@ -18,4 +18,5 @@
 import javax.swing.JButton;
 import javax.swing.JDialog;
+import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -34,9 +35,10 @@
 /**
  * This is an extended dialog for resolving conflict between {@link OsmPrimitive}s.
- *
+ * @since 1622
  */
 public class ConflictResolutionDialog extends JDialog implements PropertyChangeListener {
     /** the conflict resolver component */
     private ConflictResolver resolver;
+    private JLabel titleLabel;
 
     private ApplyResolutionAction applyResolutionAction;
@@ -109,6 +111,11 @@
     protected void build() {
         setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+        getContentPane().setLayout(new BorderLayout());
+
+        titleLabel = new JLabel();
+        titleLabel.setHorizontalAlignment(JLabel.CENTER);
+        getContentPane().add(titleLabel, BorderLayout.NORTH);
+
         updateTitle();
-        getContentPane().setLayout(new BorderLayout());
 
         resolver = new ConflictResolver();
@@ -123,9 +130,21 @@
     }
 
+    /**
+     * Constructs a new {@code ConflictResolutionDialog}.
+     * @param parent parent component
+     */
     public ConflictResolutionDialog(Component parent) {
         super(JOptionPane.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
         build();
-    }
-
+        pack();
+        if (getInsets().top > 0) {
+            titleLabel.setVisible(false);
+        }
+    }
+
+    /**
+     * Replies the conflict resolver component.
+     * @return the conflict resolver component
+     */
     public ConflictResolver getConflictResolver() {
         return resolver;
@@ -238,4 +257,12 @@
 
     @Override
+    public void setTitle(String title) {
+        super.setTitle(title);
+        if (titleLabel != null) {
+            titleLabel.setText(title);
+        }
+    }
+
+    @Override
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(ConflictResolver.MY_PRIMITIVE_PROP)) {