Исправления

composer.json

@@ -28,17 +28,6 @@
     },
     "require": {
         "php": "~8.0",
-<<<<<<< HEAD
-        "psr/log": "^1.0",
-        "monolog/monolog": "^1.6",
-        "jasny/error-handler": "^0.2.0",
-        "hood/accounts": "0.*",
-        "guzzlehttp/guzzle": "^7.2"
-    },
-    "require-dev": {
-        "phpdocumentor/phpdocumentor": ">=2.9",
-        "phpunit/phpunit": "^9"
-=======
         "psr/log": "~1.0",
         "hood/accounts": "~0.1.x-dev",
         "monolog/monolog": "~1.6",
@@ -47,7 +36,6 @@
     },
     "require-dev": {
         "phpunit/phpunit": "~9.5"
->>>>>>> a45b5c327511a74d1fae5ab0e3a1dcc68e7dc3b4
     },
     "autoload": {
         "psr-4": {