Composer fix

Author: cuppett

composer.json

@@ -51,15 +51,9 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.6",
-<<<<<<< HEAD
-        "orchestra/testbench": "^9.0",
-        "phpunit/phpunit": "^10.0|^11.0",
-        "vimeo/psalm": "^5.25"
-=======
         "orchestra/testbench": "^9.0|^10.0",
         "phpunit/phpunit": "^10.0|^11.0",
         "vimeo/psalm": "^6.12.0"
->>>>>>> 27562d7 (Update CI workflow to latest versions (#7))
     },
     "config": {
         "sort-packages": true