Index: RelationEditor.java
===================================================================
--- RelationEditor.java	(revision 1147)
+++ RelationEditor.java	(working copy)
@@ -557,7 +557,7 @@
 						return;
 					final ConflictDialog dlg = Main.map.conflictDialog;
 					dlg.add(visitor.conflicts);
-					JOptionPane.showMessageDialog(Main.parent,
+					JOptionPane.showMessageDialog(this,
 							tr("There were conflicts during import."));
 					if (!dlg.isVisible())
 						dlg.action