diff --git a/settings.json b/settings.json
index d39d620..f1fb903 100644
--- a/settings.json
+++ b/settings.json
@@ -186,6 +186,8 @@
     "suppressNoRepositoryWarning": false
   },
   "gitlens.keymap": "alternate",
+  "githubPullRequests.pullBranch": "never",
+  "git.mergeEditor": false,
   "Lua.telemetry.enable": false,
   "go.toolsManagement.autoUpdate": true,
   "go.formatTool": "goimports",
@@ -242,5 +244,4 @@
   "emmet.includeLanguages": {
     "erb": "html"
   },
-  "githubPullRequests.pullBranch": "never"
 }