settings.json conflict

[xgqfrms]

settings.json conflict

{
    "terminal.integrated.shell.osx": "/bin/zsh",
    "workbench.iconTheme": "vscode-icons",
    "peacock.favoriteColors": [
        {
            "name": "Angular Red",
            "value": "#b52e31"
        },
        {
            "name": "Auth0 Orange",
            "value": "#eb5424"
        },
        {
            "name": "Azure Blue",
            "value": "#007fff"
        },
        {
            "name": "C# Purple",
            "value": "#68217A"
        },
        {
            "name": "Gatsby Purple",
            "value": "#639"
        },
        {
            "name": "Go Cyan",
            "value": "#5dc9e2"
        },
        {
            "name": "Java Blue-Gray",
            "value": "#557c9b"
        },
        {
            "name": "JavaScript Yellow",
            "value": "#f9e64f"
        },
        {
            "name": "Mandalorian Blue",
            "value": "#1857a4"
        },
        {
            "name": "Node Green",
            "value": "#215732"
        },
        {
            "name": "React Blue",
            "value": "#00b3e6"
        },
        {
            "name": "Something Different",
            "value": "#832561"
        },
        {
            "name": "Vue Green",
            "value": "#42b883"
        }
    ],
    "editor.tabSize": 2,
    "editor.renderWhitespace": "all",
    "editor.fontSize": 16,
    "explorer.confirmDelete": false,
    "javascript.updateImportsOnFileMove.enabled": "always",
    "todo-tree.tree.showScanModeButton": false,
    "files.associations": {
        "*.jsx": "javascriptreact",
        "*.js": "javascriptreact",
        "*.cjson": "jsonc",
        "*.wxss": "css",
        "*.wxs": "javascript"
    },
    "emmet.includeLanguages": {
        "wxml": "html"
    },
    "minapp-vscode.disableAutoConfig": true,
    "cSpell.userWords": [
        "htmls",
        "xgqfrms"
    ],
    "security.workspace.trust.untrustedFiles": "open",
    "[json]": {
        "editor.defaultFormatter": "vscode.json-language-features"
    },
    "[javascriptreact]": {
        "editor.defaultFormatter": "esbenp.prettier-vscode"
    },
    "telemetry.telemetryLevel": "off",
    "explorer.confirmDragAndDrop": false,
    "database-client.showFilter": true,
    "editor.unicodeHighlight.invisibleCharacters": false
}

[xgqfrms]

{
  "files.associations": {
    "*.jsx": "javascriptreact",
    "*.js": "javascriptreact",
    "*.cjson": "jsonc",
    "*.wxss": "css",
    "*.wxs": "javascript",
    "*.sed": "shellscript"
  },
  "emmet.includeLanguages": {
    "wxml": "html"
  },
"minapp-vscode.disableAutoConfig": true,
  "explorer.confirmDelete": false,
  "workbench.editorAssociations": {
    "*.wasm": "default"
  },
  "[sql]": {
    // 
  },
  "editor.unicodeHighlight.allowedLocales": {
    "zh-hans": true,
    "zh-hant": true
  }
}

[xgqfrms]