diff --git a/composer.lock b/composer.lock
index 20136e89da..2226627342 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8989,15 +8989,9 @@
         }
     ],
     "aliases": [],
-<<<<<<< feat-mongodb
     "minimum-stability": "dev",
     "stability-flags": {},
     "prefer-stable": true,
-=======
-    "minimum-stability": "stable",
-    "stability-flags": {},
-    "prefer-stable": false,
->>>>>>> 1.8.x
     "prefer-lowest": false,
     "platform": {
         "php": ">=8.3.0",