Merge conflict

Author: jcobis

package-lock.json

@@ -53,15 +53,15 @@
     "@mongodb-js/compass-app-stores": "^7.64.1",
     "@mongodb-js/compass-components": "^1.54.1",
     "@mongodb-js/compass-connections": "^1.78.1",
-    "@mongodb-js/compass-editor": "^0.55.0",
+    "@mongodb-js/compass-editor": "^0.56.1",
     "@mongodb-js/compass-generative-ai": "^0.57.1",
     "@mongodb-js/compass-logging": "^1.7.19",
     "@mongodb-js/compass-telemetry": "^1.16.1",
     "@mongodb-js/compass-utils": "^0.9.17",
     "@mongodb-js/compass-workspaces": "^0.59.1",
     "@mongodb-js/connection-info": "^0.21.1",
     "@mongodb-js/mongodb-constants": "^0.14.0",
-    "bson": "^6.10.1",
+    "bson": "^6.10.4",
     "compass-preferences-model": "^2.57.1",
     "hadron-document": "^8.10.4",
     "mongodb": "^6.19.0",