Revert back some changes

.gitignore

@@ -17,7 +17,7 @@
 /Library/Homebrew/test/junit
 /Library/Homebrew/test/fs_leak_log
 /Library/Homebrew/vendor/portable-ruby
-#/Library/Taps
+/Library/Taps
 /Library/PinnedTaps
 /Library/Homebrew/.byebug_history
 /Library/Homebrew/sorbet/rbi/hidden-definitions/errors.txt

.vscode/settings.json

@@ -23,7 +23,5 @@
     "editor.codeActionsOnSave": {
       "source.fixAll.shellcheck": true,
     }
-  },
-  "git.mergeEditor": true,
-  "merge-conflict.autoNavigateNextConflict.enabled": true
+  }
 }