resolved merging issues

Author: STetsing

apps/remix-ide/src/app/tabs/locales/en/settings.json

@@ -68,6 +68,6 @@
   "settings.mcpServerConfiguration": "MCP Server Configuration",
   "settings.mcpServerConfigurationDescription": "Connect to Model Context Protocol servers for enhanced AI context",
   "settings.enableMCPEnhancement": "Enable MCP Integration",
-  "settings.enableMCPEnhancementDescription": "Manage your MCP server connections"
+  "settings.enableMCPEnhancementDescription": "Manage your MCP server connections",
   "settings.aiPrivacyPolicyDescription": "Understand how RemixAI processes your data."
 }

apps/remix-ide/src/app/tabs/settings-tab.tsx

@@ -15,8 +15,7 @@ const _paq = (window._paq = window._paq || [])
 const profile = {
   name: 'settings',
   displayName: 'Settings',
-  methods: ['get', 'updateCopilotChoice', 'getCopilotSetting', 'set'],
-  methods: ['get', 'updateCopilotChoice', 'getCopilotSetting', 'updateMatomoPerfAnalyticsChoice'],
+  methods: ['get', 'updateCopilotChoice', 'getCopilotSetting', 'set', 'updateMatomoPerfAnalyticsChoice'],
   events: [],
   icon: 'assets/img/settings.webp',
   description: 'Remix-IDE settings',