diff --git a/vscode/package.json b/vscode/package.json
index 2cb42ebb..a6ac9d64 100644
--- a/vscode/package.json
+++ b/vscode/package.json
@@ -507,7 +507,7 @@
             "diff",
             "merge"
           ],
-          "default": "diff",
+          "default": "merge",
           "description": "Select the editor to use when resolving proposed solutions.",
           "scope": "window",
           "order": 7