Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 12280)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 12281)
@@ -1065,6 +1065,6 @@
 
         ConflictCollection conflictsCol = getConflicts();
-        return conflictsCol == null || conflictsCol.isEmpty() || 1 == GuiHelper.runInEDTAndWaitAndReturn(() -> {
-            return new ExtendedDialog(
+        return conflictsCol == null || conflictsCol.isEmpty() || 1 == GuiHelper.runInEDTAndWaitAndReturn(() ->
+            new ExtendedDialog(
                     Main.parent,
                     /* I18N: Display title of the window showing conflicts */
@@ -1074,6 +1074,6 @@
                     tr("There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"))
                 .setButtonIcons("save", "cancel")
-                .showDialog().getValue();
-        });
+                .showDialog().getValue()
+        );
     }