Fix merge conflict

Author: markus-moser

composer.json

@@ -17,15 +17,9 @@
   "prefer-stable": true,
   "minimum-stability": "dev",
   "require": {
-<<<<<<< HEAD
-	  "php": "~8.4.0 || ~8.5.0",
+    "php": "~8.4.0 || ~8.5.0",
     "pimcore/pimcore": "^2026.1",
     "pimcore/studio-backend-bundle": "^2026.1"
-=======
-    "php": "~8.3.0 || ~8.4.0",
-    "pimcore/pimcore": "^12.3",
-    "pimcore/studio-backend-bundle": "^2025.4"
->>>>>>> origin/2025.4
   },
   "require-dev": {
     "codeception/codeception": "^5.0.10",