fix conflicts

Author: mcasimir

package-lock.json

@@ -195,37 +195,37 @@
     "@electron/rebuild": "^3.7.2",
     "@electron/remote": "^2.1.2",
     "@mongodb-js/atlas-service": "^0.41.0",
-    "@mongodb-js/compass-aggregations": "^9.58.0",
-    "@mongodb-js/compass-app-stores": "^7.42.0",
-    "@mongodb-js/compass-collection": "^4.55.0",
+    "@mongodb-js/compass-aggregations": "^9.58.1",
+    "@mongodb-js/compass-app-stores": "^7.42.1",
+    "@mongodb-js/compass-collection": "^4.55.1",
     "@mongodb-js/compass-components": "^1.37.0",
     "@mongodb-js/compass-connection-import-export": "^0.52.0",
     "@mongodb-js/compass-connections": "^1.56.0",
-    "@mongodb-js/compass-crud": "^13.56.0",
-    "@mongodb-js/compass-data-modeling": "^1.6.0",
-    "@mongodb-js/compass-databases-collections": "^1.55.0",
-    "@mongodb-js/compass-explain-plan": "^6.56.0",
-    "@mongodb-js/compass-export-to-language": "^9.32.0",
+    "@mongodb-js/compass-crud": "^13.56.1",
+    "@mongodb-js/compass-data-modeling": "^1.7.0",
+    "@mongodb-js/compass-databases-collections": "^1.55.1",
+    "@mongodb-js/compass-explain-plan": "^6.56.1",
+    "@mongodb-js/compass-export-to-language": "^9.32.1",
     "@mongodb-js/compass-field-store": "^9.31.0",
     "@mongodb-js/compass-find-in-page": "^4.38.0",
     "@mongodb-js/compass-generative-ai": "^0.36.0",
-    "@mongodb-js/compass-global-writes": "^1.15.0",
-    "@mongodb-js/compass-import-export": "^7.55.0",
-    "@mongodb-js/compass-indexes": "^5.55.0",
+    "@mongodb-js/compass-global-writes": "^1.15.1",
+    "@mongodb-js/compass-import-export": "^7.55.1",
+    "@mongodb-js/compass-indexes": "^5.55.1",
     "@mongodb-js/compass-intercom": "^0.22.0",
     "@mongodb-js/compass-logging": "^1.6.9",
-    "@mongodb-js/compass-query-bar": "^8.57.0",
-    "@mongodb-js/compass-saved-aggregations-queries": "^1.56.0",
-    "@mongodb-js/compass-schema": "^6.57.0",
-    "@mongodb-js/compass-schema-validation": "^6.56.0",
-    "@mongodb-js/compass-serverstats": "^16.55.0",
+    "@mongodb-js/compass-query-bar": "^8.57.1",
+    "@mongodb-js/compass-saved-aggregations-queries": "^1.56.1",
+    "@mongodb-js/compass-schema": "^6.57.1",
+    "@mongodb-js/compass-schema-validation": "^6.56.1",
+    "@mongodb-js/compass-serverstats": "^16.55.1",
     "@mongodb-js/compass-settings": "^0.54.0",
-    "@mongodb-js/compass-shell": "^3.55.0",
-    "@mongodb-js/compass-sidebar": "^5.56.0",
+    "@mongodb-js/compass-shell": "^3.55.1",
+    "@mongodb-js/compass-sidebar": "^5.56.1",
     "@mongodb-js/compass-telemetry": "^1.7.0",
     "@mongodb-js/compass-utils": "^0.8.8",
-    "@mongodb-js/compass-welcome": "^0.54.0",
-    "@mongodb-js/compass-workspaces": "^0.37.0",
+    "@mongodb-js/compass-welcome": "^0.54.1",
+    "@mongodb-js/compass-workspaces": "^0.37.1",
     "@mongodb-js/connection-info": "^0.14.0",
     "@mongodb-js/connection-storage": "^0.31.0",
     "@mongodb-js/devtools-proxy-support": "^0.4.4",