fix: Fix merge conflicts

Author: tjtanjin

.vscode/settings.json

@@ -2,11 +2,21 @@
   "[javascript]": {
     "editor.formatOnSave": false
   },
+  "[typescript]": {
+    "editor.formatOnSave": true
+  },
+  "[javascriptreact]": {
+    "editor.formatOnSave": true
+  },
+  "[typescriptreact]": {
+    "editor.formatOnSave": true
+  },
   "editor.formatOnSave": false,
   "editor.tabSize": 2,
   "editor.defaultFormatter": "dbaeumer.vscode-eslint",
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "explicit"
   },
   "editor.detectIndentation": false,
   "typescript.updateImportsOnFileMove.enabled": "always",
@@ -15,4 +25,4 @@
   "terminal.integrated.rendererType": "dom",
   "window.zoomLevel": 0,
   "files.eol": "\n"
-}
+}