Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 1651)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 1652)
@@ -109,5 +109,5 @@
 
     private final void resolve() {
-        String method = Main.pref.get("conflict.resolution", "traditional");
+        String method = Main.pref.get("conflict.resolution", "extended");
         method = method.trim().toLowerCase();
         if (method.equals("traditional")) {