diff --git a/vscodium/settings.json b/vscodium/settings.json
index 9fb1d9c..ef0514c 100644
--- a/vscodium/settings.json
+++ b/vscodium/settings.json
@@ -17,5 +17,6 @@
     "editor.guides.bracketPairs": "active",
     "window.commandCenter": true,
     "workbench.iconTheme": "material-icon-theme",
-    "git.openRepositoryInParentFolders": "always"
+    "git.openRepositoryInParentFolders": "always",
+    "git.mergeEditor": true
 }