diff --git a/composer.lock b/composer.lock
index 22ca788..1e88986 100644
--- a/composer.lock
+++ b/composer.lock
@@ -697,7 +697,6 @@
         },
         {
             "name": "guzzlehttp/promises",
-<<<<<<< HEAD
             "version": "1.5.1",
             "source": {
                 "type": "git",
@@ -708,18 +707,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
                 "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
-=======
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/promises.git",
-                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d",
-                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -774,7 +761,6 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/guzzle/promises/tree/1.5.1"
             },
             "funding": [
@@ -805,24 +791,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
                 "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
-=======
-                "source": "https://github.com/guzzle/promises/tree/1.4.1"
-            },
-            "time": "2021-03-07T09:25:29+00:00"
-        },
-        {
-            "name": "guzzlehttp/psr7",
-            "version": "1.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/35ea11d335fd638b5882ff1725228b3d35496ab1",
-                "reference": "35ea11d335fd638b5882ff1725228b3d35496ab1",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -903,7 +871,6 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/guzzle/psr7/tree/1.8.5"
             },
             "funding": [
@@ -1089,11 +1056,6 @@
                 "source": "https://github.com/laravel/cashier"
             },
             "time": "2020-03-24T16:58:53+00:00"
-=======
-                "source": "https://github.com/guzzle/psr7/tree/1.8.1"
-            },
-            "time": "2021-03-21T16:25:00+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "laravel/framework",
@@ -1452,7 +1414,6 @@
             "time": "2021-03-05T21:15:54+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "league/flysystem",
             "version": "1.1.9",
             "source": {
@@ -1464,178 +1425,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99",
                 "reference": "094defdb4a7001845300334e7c1ee2335925ef99",
-=======
-            "name": "laravel/ui",
-            "version": "v3.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laravel/ui.git",
-                "reference": "a1f82c6283c8373ea1958b8a27c3d5c98cade351"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/ui/zipball/a1f82c6283c8373ea1958b8a27c3d5c98cade351",
-                "reference": "a1f82c6283c8373ea1958b8a27c3d5c98cade351",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/console": "^8.0",
-                "illuminate/filesystem": "^8.0",
-                "illuminate/support": "^8.0",
-                "php": "^7.3|^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                },
-                "laravel": {
-                    "providers": [
-                        "Laravel\\Ui\\UiServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laravel\\Ui\\": "src/",
-                    "Illuminate\\Foundation\\Auth\\": "auth-backend/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Taylor Otwell",
-                    "email": "taylor@laravel.com"
-                }
-            ],
-            "description": "Laravel UI utilities and presets.",
-            "keywords": [
-                "laravel",
-                "ui"
-            ],
-            "support": {
-                "issues": "https://github.com/laravel/ui/issues",
-                "source": "https://github.com/laravel/ui/tree/v3.2.0"
-            },
-            "time": "2021-01-06T19:20:22+00:00"
-        },
-        {
-            "name": "league/commonmark",
-            "version": "1.5.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf",
-                "reference": "08fa59b8e4e34ea8a773d55139ae9ac0e0aecbaf",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": "^7.1 || ^8.0"
-            },
-            "conflict": {
-                "scrutinizer/ocular": "1.7.*"
-            },
-            "require-dev": {
-                "cebe/markdown": "~1.0",
-                "commonmark/commonmark.js": "0.29.2",
-                "erusev/parsedown": "~1.0",
-                "ext-json": "*",
-                "github/gfm": "0.29.0",
-                "michelf/php-markdown": "~1.4",
-                "mikehaertl/php-shellcommand": "^1.4",
-                "phpstan/phpstan": "^0.12",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.2",
-                "scrutinizer/ocular": "^1.5",
-                "symfony/finder": "^4.2"
-            },
-            "bin": [
-                "bin/commonmark"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "League\\CommonMark\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Colin O'Dell",
-                    "email": "colinodell@gmail.com",
-                    "homepage": "https://www.colinodell.com",
-                    "role": "Lead Developer"
-                }
-            ],
-            "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and Github-Flavored Markdown (GFM)",
-            "homepage": "https://commonmark.thephpleague.com",
-            "keywords": [
-                "commonmark",
-                "flavored",
-                "gfm",
-                "github",
-                "github-flavored",
-                "markdown",
-                "md",
-                "parser"
-            ],
-            "support": {
-                "docs": "https://commonmark.thephpleague.com/",
-                "issues": "https://github.com/thephpleague/commonmark/issues",
-                "rss": "https://github.com/thephpleague/commonmark/releases.atom",
-                "source": "https://github.com/thephpleague/commonmark"
-            },
-            "funding": [
-                {
-                    "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.colinodell.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.paypal.me/colinpodell/10.00",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/colinodell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/colinodell",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/league/commonmark",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-03-28T18:51:39+00:00"
-        },
-        {
-            "name": "league/flysystem",
-            "version": "1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f3ad69181b8afed2c9edf7be5a2918144ff4ea32",
-                "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -1708,11 +1497,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/flysystem/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/thephpleague/flysystem/tree/1.1.9"
-=======
-                "source": "https://github.com/thephpleague/flysystem/tree/1.1.4"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -1720,11 +1505,7 @@
                     "type": "other"
                 }
             ],
-<<<<<<< HEAD
             "time": "2021-12-09T09:40:50+00:00"
-=======
-            "time": "2021-06-23T21:56:05+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "league/mime-type-detection",
@@ -1784,7 +1565,6 @@
         },
         {
             "name": "monolog/monolog",
-<<<<<<< HEAD
             "version": "1.27.0",
             "source": {
                 "type": "git",
@@ -1795,18 +1575,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/Seldaek/monolog/zipball/52ebd235c1f7e0d5e1b16464b695a28335f8e44a",
                 "reference": "52ebd235c1f7e0d5e1b16464b695a28335f8e44a",
-=======
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
-                "reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -1877,11 +1645,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/Seldaek/monolog/tree/1.27.0"
-=======
-                "source": "https://github.com/Seldaek/monolog/tree/2.2.0"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -1893,7 +1657,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-03-13T20:29:46+00:00"
         },
         {
@@ -1963,22 +1726,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4a54375c21eea4811dbd1149fe6b246517554e78",
                 "reference": "4a54375c21eea4811dbd1149fe6b246517554e78",
-=======
-            "time": "2020-12-14T13:15:25+00:00"
-        },
-        {
-            "name": "nesbot/carbon",
-            "version": "2.46.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4",
-                "reference": "2fd2c4a77d58a4e95234c8a61c5df1f157a91bf4",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -2061,11 +1808,7 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-02-13T18:13:33+00:00"
-=======
-            "time": "2021-02-24T17:30:44+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "nikic/php-parser",
@@ -2125,7 +1868,6 @@
         },
         {
             "name": "opis/closure",
-<<<<<<< HEAD
             "version": "3.6.3",
             "source": {
                 "type": "git",
@@ -2136,18 +1878,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad",
                 "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad",
-=======
-            "version": "3.6.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/opis/closure.git",
-                "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/opis/closure/zipball/06e2ebd25f2869e54a306dda991f7db58066f7f6",
-                "reference": "06e2ebd25f2869e54a306dda991f7db58066f7f6",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -2197,7 +1927,6 @@
             ],
             "support": {
                 "issues": "https://github.com/opis/closure/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/opis/closure/tree/3.6.3"
             },
             "time": "2022-01-27T09:35:39+00:00"
@@ -2407,11 +2136,6 @@
                 "source": "https://github.com/PhenX/php-svg-lib/tree/0.3.4"
             },
             "time": "2021-10-18T02:13:32+00:00"
-=======
-                "source": "https://github.com/opis/closure/tree/3.6.2"
-            },
-            "time": "2021-04-09T13:42:10+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "phpoption/phpoption",
@@ -2485,7 +2209,6 @@
             "time": "2021-12-04T23:24:31+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "phpseclib/bcmath_compat",
             "version": "2.0.1",
             "source": {
@@ -2672,23 +2395,6 @@
             },
             "require": {
                 "php": ">=7.4.0"
-=======
-            "name": "psr/container",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.0"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "type": "library",
             "autoload": {
@@ -2717,31 +2423,26 @@
             ],
             "support": {
                 "issues": "https://github.com/php-fig/container/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/php-fig/container/tree/1.1.2"
             },
             "time": "2021-11-05T16:50:12+00:00"
-=======
-                "source": "https://github.com/php-fig/container/tree/1.1.1"
-            },
-            "time": "2021-03-05T17:36:06+00:00"
         },
         {
-            "name": "psr/event-dispatcher",
-            "version": "1.0.0",
+            "name": "psr/http-message",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/event-dispatcher.git",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
-                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
@@ -2751,7 +2452,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\EventDispatcher\\": "src/"
+                    "Psr\\Http\\Message\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2764,45 +2465,47 @@
                     "homepage": "http://www.php-fig.org/"
                 }
             ],
-            "description": "Standard interfaces for event handling.",
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
             "keywords": [
-                "events",
+                "http",
+                "http-message",
                 "psr",
-                "psr-14"
+                "psr-7",
+                "request",
+                "response"
             ],
             "support": {
-                "issues": "https://github.com/php-fig/event-dispatcher/issues",
-                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+                "source": "https://github.com/php-fig/http-message/tree/master"
             },
-            "time": "2019-01-08T18:20:26+00:00"
+            "time": "2016-08-06T14:39:51+00:00"
         },
         {
-            "name": "psr/http-client",
-            "version": "1.0.1",
+            "name": "psr/log",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/http-client.git",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621"
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
-                "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^8.0",
-                "psr/http-message": "^1.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.1.x-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Http\\Client\\": "src/"
+                    "Psr\\Log\\": "Psr/Log/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2812,35 +2515,33 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interface for HTTP clients",
-            "homepage": "https://github.com/php-fig/http-client",
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
             "keywords": [
-                "http",
-                "http-client",
+                "log",
                 "psr",
-                "psr-18"
+                "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/master"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2020-06-29T06:28:15+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
-            "name": "psr/http-message",
+            "name": "psr/simple-cache",
             "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
-                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
                 "shasum": ""
             },
             "require": {
@@ -2854,7 +2555,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
+                    "Psr\\SimpleCache\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2867,110 +2568,7 @@
                     "homepage": "http://www.php-fig.org/"
                 }
             ],
-            "description": "Common interface for HTTP messages",
-            "homepage": "https://github.com/php-fig/http-message",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
-            },
-            "time": "2016-08-06T14:39:51+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.4"
-            },
-            "time": "2021-05-03T11:20:27+00:00"
-        },
-        {
-            "name": "psr/simple-cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\SimpleCache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interfaces for simple caching",
+            "description": "Common interfaces for simple caching",
             "keywords": [
                 "cache",
                 "caching",
@@ -3104,7 +2702,6 @@
             "time": "2019-03-08T08:55:37+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "ramsey/uuid",
             "version": "3.9.6",
             "source": {
@@ -3116,19 +2713,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/ramsey/uuid/zipball/ffa80ab953edd85d5b6c004f96181a538aad35a3",
                 "reference": "ffa80ab953edd85d5b6c004f96181a538aad35a3",
-=======
-            "name": "ramsey/collection",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ramsey/collection.git",
-                "reference": "28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/collection/zipball/28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1",
-                "reference": "28a5c4ab2f5111db6a60b2b4ec84057e0f43b9c1",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -3211,55 +2795,26 @@
             "require": {
                 "brick/math": "^0.8 || ^0.9",
                 "ext-json": "*",
-<<<<<<< HEAD
                 "paragonie/random_compat": "^1 | ^2 | ^9.99.99",
                 "php": "^5.4 | ^7.0 | ^8.0",
-=======
-                "php": "^7.2 || ^8",
-                "ramsey/collection": "^1.0",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "symfony/polyfill-ctype": "^1.8"
             },
             "replace": {
                 "rhumsaa/uuid": "self.version"
             },
             "require-dev": {
-<<<<<<< HEAD
                 "codeception/aspect-mock": "^1 | ^2",
                 "doctrine/annotations": "^1.2",
                 "goaop/framework": "1.0.0-alpha.2 | ^1 | >=2.1.0 <=2.3.2",
                 "mockery/mockery": "^0.9.11 | ^1",
-=======
-                "codeception/aspect-mock": "^3",
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7.0",
-                "doctrine/annotations": "^1.8",
-                "goaop/framework": "^2",
-                "mockery/mockery": "^1.3",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "moontoast/math": "^1.1",
                 "nikic/php-parser": "<=4.5.0",
                 "paragonie/random-lib": "^2",
-<<<<<<< HEAD
                 "php-mock/php-mock-phpunit": "^0.3 | ^1.1 | ^2.6",
                 "php-parallel-lint/php-parallel-lint": "^1.3",
                 "phpunit/phpunit": ">=4.8.36 <9.0.0 | >=9.3.0",
                 "squizlabs/php_codesniffer": "^3.5",
                 "yoast/phpunit-polyfills": "^1.0"
-=======
-                "php-mock/php-mock-mockery": "^1.3",
-                "php-mock/php-mock-phpunit": "^2.5",
-                "php-parallel-lint/php-parallel-lint": "^1.1",
-                "phpbench/phpbench": "^0.17.1",
-                "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-mockery": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^8.5",
-                "psy/psysh": "^0.10.0",
-                "slevomat/coding-standard": "^6.0",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "3.9.4"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "suggest": {
                 "ext-bcmath": "Enables faster math with arbitrary-precision integers using BCMath.",
@@ -3300,7 +2855,6 @@
                 "source": "https://github.com/ramsey/uuid"
             },
             "funding": [
-<<<<<<< HEAD
                 {
                     "url": "https://github.com/ramsey",
                     "type": "github"
@@ -3348,14 +2902,11 @@
                 "MIT"
             ],
             "authors": [
-=======
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 {
                     "url": "https://github.com/ramsey",
                     "type": "github"
                 }
             ],
-<<<<<<< HEAD
             "description": "Parser for CSS Files written in PHP",
             "homepage": "https://www.sabberworm.com/blog/2010/6/10/php-css-parser",
             "keywords": [
@@ -3441,22 +2992,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c",
                 "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c",
-=======
-            "time": "2020-08-18T17:17:46+00:00"
-        },
-        {
-            "name": "swiftmailer/swiftmailer",
-            "version": "v6.2.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "15f7faf8508e04471f666633addacf54c0ab5933"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/15f7faf8508e04471f666633addacf54c0ab5933",
-                "reference": "15f7faf8508e04471f666633addacf54c0ab5933",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -3506,11 +3041,7 @@
             ],
             "support": {
                 "issues": "https://github.com/swiftmailer/swiftmailer/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0"
-=======
-                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.7"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -3522,7 +3053,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "abandoned": "symfony/mailer",
             "time": "2021-10-18T15:26:12+00:00"
         },
@@ -3538,29 +3068,12 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/console/zipball/bdcc66f3140421038f495e5b50e3ca6ffa14c773",
                 "reference": "bdcc66f3140421038f495e5b50e3ca6ffa14c773",
-=======
-            "time": "2021-03-09T12:30:35+00:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v5.2.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/35f039df40a3b335ebf310f244cb242b3a83ac8d",
-                "reference": "35f039df40a3b335ebf310f244cb242b3a83ac8d",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php73": "^1.8",
-<<<<<<< HEAD
                 "symfony/polyfill-php80": "^1.16",
                 "symfony/service-contracts": "^1.1|^2"
             },
@@ -3568,16 +3081,6 @@
                 "psr/log": ">=3",
                 "symfony/dependency-injection": "<3.4",
                 "symfony/event-dispatcher": "<4.3|>=5",
-=======
-                "symfony/polyfill-php80": "^1.15",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/string": "^5.1"
-            },
-            "conflict": {
-                "symfony/dependency-injection": "<4.4",
-                "symfony/dotenv": "<5.1",
-                "symfony/event-dispatcher": "<4.4",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "symfony/lock": "<4.4",
                 "symfony/process": "<4.4"
             },
@@ -3585,17 +3088,10 @@
                 "psr/log-implementation": "1.0|2.0"
             },
             "require-dev": {
-<<<<<<< HEAD
                 "psr/log": "^1|^2",
                 "symfony/config": "^3.4|^4.0|^5.0",
                 "symfony/dependency-injection": "^3.4|^4.0|^5.0",
                 "symfony/event-dispatcher": "^4.3",
-=======
-                "psr/log": "~1.0",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/event-dispatcher": "^4.4|^5.0",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "symfony/lock": "^4.4|^5.0",
                 "symfony/process": "^4.4|^5.0",
                 "symfony/var-dumper": "^4.4|^5.0"
@@ -3658,19 +3154,11 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-03-26T22:12:04+00:00"
         },
         {
             "name": "symfony/css-selector",
             "version": "v5.4.3",
-=======
-            "time": "2021-03-28T09:42:18+00:00"
-        },
-        {
-            "name": "symfony/css-selector",
-            "version": "v5.2.4",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
@@ -3716,11 +3204,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/css-selector/tree/v5.4.3"
-=======
-                "source": "https://github.com/symfony/css-selector/tree/v5.2.4"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -3739,7 +3223,6 @@
             "time": "2022-01-02T09:53:40+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "symfony/debug",
             "version": "v4.4.37",
             "source": {
@@ -3819,19 +3302,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-=======
-            "name": "symfony/deprecation-contracts",
-            "version": "v2.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627",
-                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -3840,11 +3310,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-<<<<<<< HEAD
                     "dev-main": "2.5-dev"
-=======
-                    "dev-main": "2.4-dev"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -3873,11 +3339,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.1"
-=======
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -3893,7 +3355,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-01-02T09:53:40+00:00"
         },
         {
@@ -3914,28 +3375,6 @@
                 "php": ">=7.1.3",
                 "psr/log": "^1|^2|^3",
                 "symfony/debug": "^4.4.5",
-=======
-            "time": "2021-03-23T23:28:01+00:00"
-        },
-        {
-            "name": "symfony/error-handler",
-            "version": "v5.2.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/error-handler.git",
-                "reference": "bdb7fb4188da7f4211e4b88350ba0dfdad002b03"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/bdb7fb4188da7f4211e4b88350ba0dfdad002b03",
-                "reference": "bdb7fb4188da7f4211e4b88350ba0dfdad002b03",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "psr/log": "^1.0",
-                "symfony/polyfill-php80": "^1.15",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "symfony/var-dumper": "^4.4|^5.0"
             },
             "require-dev": {
@@ -3989,7 +3428,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-03-07T13:29:34+00:00"
         },
         {
@@ -4010,29 +3448,6 @@
                 "php": ">=7.1.3",
                 "symfony/event-dispatcher-contracts": "^1.1",
                 "symfony/polyfill-php80": "^1.16"
-=======
-            "time": "2021-03-16T09:07:47+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v5.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "d08d6ec121a425897951900ab692b612a61d6240"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d08d6ec121a425897951900ab692b612a61d6240",
-                "reference": "d08d6ec121a425897951900ab692b612a61d6240",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
-                "symfony/event-dispatcher-contracts": "^2",
-                "symfony/polyfill-php80": "^1.15"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "conflict": {
                 "symfony/dependency-injection": "<4.4"
@@ -4042,21 +3457,12 @@
                 "symfony/event-dispatcher-implementation": "2.0"
             },
             "require-dev": {
-<<<<<<< HEAD
                 "psr/log": "^1|^2|^3",
                 "symfony/config": "^3.4|^4.0|^5.0",
                 "symfony/dependency-injection": "^3.4|^4.0|^5.0",
                 "symfony/error-handler": "~3.4|~4.4",
                 "symfony/expression-language": "^3.4|^4.0|^5.0",
                 "symfony/http-foundation": "^3.4|^4.0|^5.0",
-=======
-                "psr/log": "~1.0",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/expression-language": "^4.4|^5.0",
-                "symfony/http-foundation": "^4.4|^5.0",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "symfony/service-contracts": "^1.1|^2",
                 "symfony/stopwatch": "^4.4|^5.0"
             },
@@ -4090,11 +3496,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.37"
-=======
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.4"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -4110,7 +3512,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-01-02T09:41:36+00:00"
         },
         {
@@ -4125,22 +3526,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e",
                 "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e",
-=======
-            "time": "2021-02-18T17:12:37+00:00"
-        },
-        {
-            "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/69fee1ad2332a7cbab3aca13591953da9cdb7a11",
-                "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -4153,11 +3538,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-<<<<<<< HEAD
                     "dev-main": "1.1-dev"
-=======
-                    "dev-main": "2.4-dev"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -4194,11 +3575,7 @@
                 "standards"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.12"
-=======
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.4.0"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -4214,7 +3591,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-01-02T09:41:36+00:00"
         },
         {
@@ -4234,26 +3610,6 @@
             "require": {
                 "php": ">=7.1.3",
                 "symfony/polyfill-php80": "^1.16"
-=======
-            "time": "2021-03-23T23:28:01+00:00"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v5.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "0d639a0943822626290d169965804f79400e6a04"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/0d639a0943822626290d169965804f79400e6a04",
-                "reference": "0d639a0943822626290d169965804f79400e6a04",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "type": "library",
             "autoload": {
@@ -4281,11 +3637,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/finder/tree/v4.4.37"
-=======
-                "source": "https://github.com/symfony/finder/tree/v5.2.4"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -4301,7 +3653,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-01-02T09:41:36+00:00"
         },
         {
@@ -4316,22 +3667,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1a4f708e4e87f335d1b1be6148060739152f0bd5",
                 "reference": "1a4f708e4e87f335d1b1be6148060739152f0bd5",
-=======
-            "time": "2021-02-15T18:55:04+00:00"
-        },
-        {
-            "name": "symfony/http-client-contracts",
-            "version": "v2.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4",
-                "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -4343,11 +3678,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-<<<<<<< HEAD
                     "dev-main": "2.5-dev"
-=======
-                    "dev-main": "2.4-dev"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -4384,11 +3715,7 @@
                 "standards"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.1"
-=======
-                "source": "https://github.com/symfony/http-client-contracts/tree/v2.4.0"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -4404,7 +3731,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-03-13T20:07:29+00:00"
         },
         {
@@ -4419,22 +3745,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/http-foundation/zipball/60e8e42a4579551e5ec887d04380e2ab9e4cc314",
                 "reference": "60e8e42a4579551e5ec887d04380e2ab9e4cc314",
-=======
-            "time": "2021-04-11T23:07:08+00:00"
-        },
-        {
-            "name": "symfony/http-foundation",
-            "version": "v5.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "54499baea7f7418bce7b5ec92770fd0799e8e9bf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/54499baea7f7418bce7b5ec92770fd0799e8e9bf",
-                "reference": "54499baea7f7418bce7b5ec92770fd0799e8e9bf",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -4478,11 +3788,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/http-foundation/tree/v4.4.39"
-=======
-                "source": "https://github.com/symfony/http-foundation/tree/v5.2.4"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -4498,7 +3804,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-03-04T07:06:13+00:00"
         },
         {
@@ -4520,30 +3825,6 @@
                 "psr/log": "^1|^2",
                 "symfony/error-handler": "^4.4",
                 "symfony/event-dispatcher": "^4.4",
-=======
-            "time": "2021-02-25T17:16:57+00:00"
-        },
-        {
-            "name": "symfony/http-kernel",
-            "version": "v5.2.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "f34de4c61ca46df73857f7f36b9a3805bdd7e3b2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f34de4c61ca46df73857f7f36b9a3805bdd7e3b2",
-                "reference": "f34de4c61ca46df73857f7f36b9a3805bdd7e3b2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "psr/log": "~1.0",
-                "symfony/deprecation-contracts": "^2.1",
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/event-dispatcher": "^5.0",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "symfony/http-client-contracts": "^1.1|^2",
                 "symfony/http-foundation": "^4.4.30|^5.3.7",
                 "symfony/polyfill-ctype": "^1.8",
@@ -4571,7 +3852,6 @@
             },
             "require-dev": {
                 "psr/cache": "^1.0|^2.0|^3.0",
-<<<<<<< HEAD
                 "symfony/browser-kit": "^4.3|^5.0",
                 "symfony/config": "^3.4|^4.0|^5.0",
                 "symfony/console": "^3.4|^4.0",
@@ -4585,20 +3865,6 @@
                 "symfony/stopwatch": "^3.4|^4.0|^5.0",
                 "symfony/templating": "^3.4|^4.0|^5.0",
                 "symfony/translation": "^4.2|^5.0",
-=======
-                "symfony/browser-kit": "^4.4|^5.0",
-                "symfony/config": "^5.0",
-                "symfony/console": "^4.4|^5.0",
-                "symfony/css-selector": "^4.4|^5.0",
-                "symfony/dependency-injection": "^5.1.8",
-                "symfony/dom-crawler": "^4.4|^5.0",
-                "symfony/expression-language": "^4.4|^5.0",
-                "symfony/finder": "^4.4|^5.0",
-                "symfony/process": "^4.4|^5.0",
-                "symfony/routing": "^4.4|^5.0",
-                "symfony/stopwatch": "^4.4|^5.0",
-                "symfony/translation": "^4.4|^5.0",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "symfony/translation-contracts": "^1.1|^2",
                 "twig/twig": "^2.13|^3.0.4"
             },
@@ -4634,11 +3900,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/http-kernel/tree/v4.4.40"
-=======
-                "source": "https://github.com/symfony/http-kernel/tree/v5.2.6"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -4654,7 +3916,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-04-02T05:55:50+00:00"
         },
         {
@@ -4669,22 +3930,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/mime/zipball/92d27a34dea2e199fa9b687e3fff3a7d169b7b1c",
                 "reference": "92d27a34dea2e199fa9b687e3fff3a7d169b7b1c",
-=======
-            "time": "2021-03-29T05:16:58+00:00"
-        },
-        {
-            "name": "symfony/mime",
-            "version": "v5.2.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/mime.git",
-                "reference": "1b2092244374cbe48ae733673f2ca0818b37197b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/1b2092244374cbe48ae733673f2ca0818b37197b",
-                "reference": "1b2092244374cbe48ae733673f2ca0818b37197b",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -4738,11 +3983,7 @@
                 "mime-type"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/mime/tree/v5.4.7"
-=======
-                "source": "https://github.com/symfony/mime/tree/v5.2.6"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -4758,19 +3999,11 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-03-11T16:08:05+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
             "version": "v1.25.0",
-=======
-            "time": "2021-03-12T13:18:39+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.22.1",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -4832,11 +4065,7 @@
                 "portable"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
-=======
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -4856,7 +4085,6 @@
         },
         {
             "name": "symfony/polyfill-iconv",
-<<<<<<< HEAD
             "version": "v1.25.0",
             "source": {
                 "type": "git",
@@ -4867,18 +4095,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/f1aed619e28cb077fc83fac8c4c0383578356e40",
                 "reference": "f1aed619e28cb077fc83fac8c4c0383578356e40",
-=======
-            "version": "v1.22.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342",
-                "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -4932,11 +4148,7 @@
                 "shim"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/polyfill-iconv/tree/v1.25.0"
-=======
-                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -4952,7 +4164,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-01-04T09:04:05+00:00"
         },
         {
@@ -4967,103 +4178,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/749045c69efb97c70d25d7463abba812e91f3a44",
                 "reference": "749045c69efb97c70d25d7463abba812e91f3a44",
-=======
-            "time": "2021-01-22T09:19:47+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.22.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170",
-                "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.22-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's grapheme_* functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "grapheme",
-                "intl",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-01-22T09:19:47+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-idn",
-            "version": "v1.22.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "2d63434d922daf7da8dd863e7907e67ee3031483"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483",
-                "reference": "2d63434d922daf7da8dd863e7907e67ee3031483",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -5121,11 +4235,7 @@
                 "shim"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.25.0"
-=======
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -5141,7 +4251,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2021-09-14T14:02:44+00:00"
         },
         {
@@ -5156,22 +4265,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
                 "reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
-=======
-            "time": "2021-01-22T09:19:47+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.22.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
-                "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -5226,11 +4319,7 @@
                 "shim"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0"
-=======
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -5246,7 +4335,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2021-02-19T12:13:01+00:00"
         },
         {
@@ -5261,22 +4349,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
                 "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
-=======
-            "time": "2021-01-22T09:19:47+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.22.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
-                "reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -5330,11 +4402,7 @@
                 "shim"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
-=======
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -5350,19 +4418,11 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2021-11-30T18:21:41+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
             "version": "v1.25.0",
-=======
-            "time": "2021-01-22T09:19:47+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php72",
-            "version": "v1.22.1",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
@@ -5418,11 +4478,7 @@
                 "shim"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0"
-=======
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -5442,11 +4498,7 @@
         },
         {
             "name": "symfony/polyfill-php73",
-<<<<<<< HEAD
             "version": "v1.25.0",
-=======
-            "version": "v1.22.1",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
@@ -5505,11 +4557,7 @@
                 "shim"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0"
-=======
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -5529,11 +4577,7 @@
         },
         {
             "name": "symfony/polyfill-php80",
-<<<<<<< HEAD
             "version": "v1.25.0",
-=======
-            "version": "v1.22.1",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
@@ -5596,11 +4640,7 @@
                 "shim"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
-=======
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -5620,7 +4660,6 @@
         },
         {
             "name": "symfony/process",
-<<<<<<< HEAD
             "version": "v4.4.40",
             "source": {
                 "type": "git",
@@ -5636,23 +4675,6 @@
             "require": {
                 "php": ">=7.1.3",
                 "symfony/polyfill-php80": "^1.16"
-=======
-            "version": "v5.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
-                "reference": "313a38f09c77fbcdc1d223e57d368cea76a2fd2f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.15"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "type": "library",
             "autoload": {
@@ -5680,11 +4702,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/process/tree/v4.4.40"
-=======
-                "source": "https://github.com/symfony/process/tree/v5.2.4"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -5700,7 +4718,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-03-18T16:18:39+00:00"
         },
         {
@@ -5720,28 +4737,6 @@
             "require": {
                 "php": ">=7.1.3",
                 "symfony/polyfill-php80": "^1.16"
-=======
-            "time": "2021-01-27T10:15:41+00:00"
-        },
-        {
-            "name": "symfony/routing",
-            "version": "v5.2.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/routing.git",
-                "reference": "31fba555f178afd04d54fd26953501b2c3f0c6e6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/31fba555f178afd04d54fd26953501b2c3f0c6e6",
-                "reference": "31fba555f178afd04d54fd26953501b2c3f0c6e6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
-                "symfony/polyfill-php80": "^1.15"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "conflict": {
                 "symfony/config": "<5.0",
@@ -5750,21 +4745,12 @@
             },
             "require-dev": {
                 "doctrine/annotations": "^1.10.4",
-<<<<<<< HEAD
                 "psr/log": "^1|^2|^3",
                 "symfony/config": "^4.2|^5.0",
                 "symfony/dependency-injection": "^3.4|^4.0|^5.0",
                 "symfony/expression-language": "^3.4|^4.0|^5.0",
                 "symfony/http-foundation": "^3.4|^4.0|^5.0",
                 "symfony/yaml": "^3.4|^4.0|^5.0"
-=======
-                "psr/log": "~1.0",
-                "symfony/config": "^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/expression-language": "^4.4|^5.0",
-                "symfony/http-foundation": "^4.4|^5.0",
-                "symfony/yaml": "^4.4|^5.0"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation loader",
@@ -5805,11 +4791,7 @@
                 "url"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/routing/tree/v4.4.37"
-=======
-                "source": "https://github.com/symfony/routing/tree/v5.2.6"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -5825,7 +4807,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-01-02T09:41:36+00:00"
         },
         {
@@ -5840,35 +4821,15 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
                 "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
-=======
-            "time": "2021-03-14T13:53:33+00:00"
-        },
-        {
-            "name": "symfony/service-contracts",
-            "version": "v2.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
-                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-<<<<<<< HEAD
                 "psr/container": "^1.1",
                 "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "ext-psr": "<1.1|>=2"
-=======
-                "psr/container": "^1.1"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -5876,11 +4837,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-<<<<<<< HEAD
                     "dev-main": "2.5-dev"
-=======
-                    "dev-main": "2.4-dev"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -5917,11 +4874,7 @@
                 "standards"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/service-contracts/tree/v2.5.1"
-=======
-                "source": "https://github.com/symfony/service-contracts/tree/v2.4.0"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -5937,7 +4890,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-03-13T20:07:29+00:00"
         },
         {
@@ -5952,22 +4904,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/translation/zipball/4ce00d6875230b839f5feef82e51971f6c886e00",
                 "reference": "4ce00d6875230b839f5feef82e51971f6c886e00",
-=======
-            "time": "2021-04-01T10:43:52+00:00"
-        },
-        {
-            "name": "symfony/string",
-            "version": "v5.2.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/string.git",
-                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
-                "reference": "ad0bd91bce2054103f5eaa18ebeba8d3bc2a0572",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -5976,93 +4912,8 @@
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
                 "symfony/polyfill-mbstring": "~1.0",
-<<<<<<< HEAD
                 "symfony/polyfill-php80": "^1.16",
                 "symfony/translation-contracts": "^1.1.6|^2"
-=======
-                "symfony/polyfill-php80": "~1.15"
-            },
-            "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/http-client": "^4.4|^5.0",
-                "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
-                "files": [
-                    "Resources/functions.php"
-                ],
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "grapheme",
-                "i18n",
-                "string",
-                "unicode",
-                "utf-8",
-                "utf8"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/string/tree/v5.2.6"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2021-03-17T17:12:15+00:00"
-        },
-        {
-            "name": "symfony/translation",
-            "version": "v5.2.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/translation.git",
-                "reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
-                "reference": "2cc7f45d96db9adfcf89adf4401d9dfed509f4e1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "^1.15",
-                "symfony/translation-contracts": "^2.3"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "conflict": {
                 "symfony/config": "<4.4",
@@ -6072,7 +4923,6 @@
                 "symfony/yaml": "<4.4"
             },
             "provide": {
-<<<<<<< HEAD
                 "symfony/translation-implementation": "1.0|2.0"
             },
             "require-dev": {
@@ -6083,18 +4933,6 @@
                 "symfony/finder": "~2.8|~3.0|~4.0|^5.0",
                 "symfony/http-kernel": "^4.4",
                 "symfony/intl": "^3.4|^4.0|^5.0",
-=======
-                "symfony/translation-implementation": "2.3"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/console": "^4.4|^5.0",
-                "symfony/dependency-injection": "^5.0",
-                "symfony/finder": "^4.4|^5.0",
-                "symfony/http-kernel": "^5.0",
-                "symfony/intl": "^4.4|^5.0",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "symfony/service-contracts": "^1.1.2|^2",
                 "symfony/yaml": "^4.4|^5.0"
             },
@@ -6132,11 +4970,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/translation/tree/v4.4.37"
-=======
-                "source": "https://github.com/symfony/translation/tree/v5.2.6"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -6152,7 +4986,6 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-01-02T09:41:36+00:00"
         },
         {
@@ -6167,22 +5000,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/1211df0afa701e45a04253110e959d4af4ef0f07",
                 "reference": "1211df0afa701e45a04253110e959d4af4ef0f07",
-=======
-            "time": "2021-03-23T19:33:48+00:00"
-        },
-        {
-            "name": "symfony/translation-contracts",
-            "version": "v2.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "95c812666f3e91db75385749fe219c5e494c7f95"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95",
-                "reference": "95c812666f3e91db75385749fe219c5e494c7f95",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -6194,11 +5011,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-<<<<<<< HEAD
                     "dev-main": "2.5-dev"
-=======
-                    "dev-main": "2.4-dev"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -6235,11 +5048,7 @@
                 "standards"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/translation-contracts/tree/v2.5.1"
-=======
-                "source": "https://github.com/symfony/translation-contracts/tree/v2.4.0"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -6255,48 +5064,27 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
-            "time": "2022-01-02T09:53:40+00:00"
-        },
-        {
-            "name": "symfony/var-dumper",
-            "version": "v4.4.39",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "35237c5e5dcb6593a46a860ba5b29c1d4683d80e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/35237c5e5dcb6593a46a860ba5b29c1d4683d80e",
-                "reference": "35237c5e5dcb6593a46a860ba5b29c1d4683d80e",
-=======
-            "time": "2021-03-23T23:28:01+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.2.6",
+            "version": "v4.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "89412a68ea2e675b4e44f260a5666729f77f668e"
+                "reference": "35237c5e5dcb6593a46a860ba5b29c1d4683d80e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89412a68ea2e675b4e44f260a5666729f77f668e",
-                "reference": "89412a68ea2e675b4e44f260a5666729f77f668e",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/35237c5e5dcb6593a46a860ba5b29c1d4683d80e",
+                "reference": "35237c5e5dcb6593a46a860ba5b29c1d4683d80e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "symfony/polyfill-mbstring": "~1.0",
-<<<<<<< HEAD
                 "symfony/polyfill-php72": "~1.5",
                 "symfony/polyfill-php80": "^1.16"
-=======
-                "symfony/polyfill-php80": "^1.15"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "conflict": {
                 "phpunit/phpunit": "<5.4.3",
@@ -6349,11 +5137,7 @@
                 "dump"
             ],
             "support": {
-<<<<<<< HEAD
                 "source": "https://github.com/symfony/var-dumper/tree/v4.4.39"
-=======
-                "source": "https://github.com/symfony/var-dumper/tree/v5.2.6"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -6369,11 +5153,7 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-02-25T10:38:15+00:00"
-=======
-            "time": "2021-03-28T09:42:18+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -6430,7 +5210,6 @@
         },
         {
             "name": "vlucas/phpdotenv",
-<<<<<<< HEAD
             "version": "v3.6.10",
             "source": {
                 "type": "git",
@@ -6441,18 +5220,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/5b547cdb25825f10251370f57ba5d9d924e6f68e",
                 "reference": "5b547cdb25825f10251370f57ba5d9d924e6f68e",
-=======
-            "version": "v5.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "b3eac5c7ac896e52deab4a99068e3f4ab12d9e56"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/b3eac5c7ac896e52deab4a99068e3f4ab12d9e56",
-                "reference": "b3eac5c7ac896e52deab4a99068e3f4ab12d9e56",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -6467,12 +5234,8 @@
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.4.1",
                 "ext-filter": "*",
-<<<<<<< HEAD
                 "ext-pcre": "*",
                 "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.21"
-=======
-                "phpunit/phpunit": "^7.5.20 || ^8.5.14 || ^9.5.1"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "suggest": {
                 "ext-filter": "Required to use the boolean validator."
@@ -6512,11 +5275,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/vlucas/phpdotenv/tree/v3.6.10"
-=======
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.3.0"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -6528,143 +5287,7 @@
                     "type": "tidelift"
                 }
             ],
-<<<<<<< HEAD
             "time": "2021-12-12T23:02:06+00:00"
-=======
-            "time": "2021-01-20T15:23:13+00:00"
-        },
-        {
-            "name": "voku/portable-ascii",
-            "version": "1.5.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/voku/portable-ascii.git",
-                "reference": "80953678b19901e5165c56752d087fc11526017c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/voku/portable-ascii/zipball/80953678b19901e5165c56752d087fc11526017c",
-                "reference": "80953678b19901e5165c56752d087fc11526017c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0"
-            },
-            "suggest": {
-                "ext-intl": "Use Intl for transliterator_transliterate() support"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "voku\\": "src/voku/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Lars Moelleken",
-                    "homepage": "http://www.moelleken.org/"
-                }
-            ],
-            "description": "Portable ASCII library - performance optimized (ascii) string functions for php.",
-            "homepage": "https://github.com/voku/portable-ascii",
-            "keywords": [
-                "ascii",
-                "clean",
-                "php"
-            ],
-            "support": {
-                "issues": "https://github.com/voku/portable-ascii/issues",
-                "source": "https://github.com/voku/portable-ascii/tree/1.5.6"
-            },
-            "funding": [
-                {
-                    "url": "https://www.paypal.me/moelleken",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/voku",
-                    "type": "github"
-                },
-                {
-                    "url": "https://opencollective.com/portable-ascii",
-                    "type": "open_collective"
-                },
-                {
-                    "url": "https://www.patreon.com/voku",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-11-12T00:07:28+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.10.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozarts/assert.git",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozarts/assert/zipball/6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "reference": "6964c76c7804814a842473e0c8fd15bab0f18e25",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<4.6.1 || 4.6.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^8.5.13"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozarts/assert/issues",
-                "source": "https://github.com/webmozarts/assert/tree/1.10.0"
-            },
-            "time": "2021-03-09T10:59:23+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         }
     ],
     "packages-dev": [
@@ -6739,7 +5362,6 @@
             "time": "2022-03-03T08:28:38+00:00"
         },
         {
-<<<<<<< HEAD
             "name": "filp/whoops",
             "version": "2.14.5",
             "source": {
@@ -6751,72 +5373,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/filp/whoops/zipball/a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
                 "reference": "a63e5e8f26ebbebf8ed3c5c691637325512eb0dc",
-=======
-            "name": "facade/ignition-contracts",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/facade/ignition-contracts.git",
-                "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
-                "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.3|^8.0"
-            },
-            "require-dev": {
-                "friendsofphp/php-cs-fixer": "^v2.15.8",
-                "phpunit/phpunit": "^9.3.11",
-                "vimeo/psalm": "^3.17.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Facade\\IgnitionContracts\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Freek Van der Herten",
-                    "email": "freek@spatie.be",
-                    "homepage": "https://flareapp.io",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Solution contracts for Ignition",
-            "homepage": "https://github.com/facade/ignition-contracts",
-            "keywords": [
-                "contracts",
-                "flare",
-                "ignition"
-            ],
-            "support": {
-                "issues": "https://github.com/facade/ignition-contracts/issues",
-                "source": "https://github.com/facade/ignition-contracts/tree/1.0.2"
-            },
-            "time": "2020-10-16T08:27:54+00:00"
-        },
-        {
-            "name": "filp/whoops",
-            "version": "2.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/filp/whoops.git",
-                "reference": "f6e14679f948d8a5cfb866fa7065a30c66bd64d3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/f6e14679f948d8a5cfb866fa7065a30c66bd64d3",
-                "reference": "f6e14679f948d8a5cfb866fa7065a30c66bd64d3",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -6866,11 +5422,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/filp/whoops/tree/2.14.5"
-=======
-                "source": "https://github.com/filp/whoops/tree/2.11.0"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -6878,11 +5430,7 @@
                     "type": "github"
                 }
             ],
-<<<<<<< HEAD
             "time": "2022-01-07T12:00:00+00:00"
-=======
-            "time": "2021-03-19T12:00:00+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "fzaninotto/faker",
@@ -6992,7 +5540,6 @@
         },
         {
             "name": "mockery/mockery",
-<<<<<<< HEAD
             "version": "1.3.5",
             "source": {
                 "type": "git",
@@ -7003,18 +5550,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/mockery/mockery/zipball/472fa8ca4e55483d55ee1e73c963718c4393791d",
                 "reference": "472fa8ca4e55483d55ee1e73c963718c4393791d",
-=======
-            "version": "1.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/mockery/mockery.git",
-                "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/d1339f64479af1bee0e82a0413813fe5345a54ea",
-                "reference": "d1339f64479af1bee0e82a0413813fe5345a54ea",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -7071,15 +5606,9 @@
             ],
             "support": {
                 "issues": "https://github.com/mockery/mockery/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/mockery/mockery/tree/1.3.5"
             },
             "time": "2021-09-13T15:33:03+00:00"
-=======
-                "source": "https://github.com/mockery/mockery/tree/1.4.3"
-            },
-            "time": "2021-02-24T09:51:49+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "myclabs/deep-copy",
@@ -7501,7 +6030,6 @@
         },
         {
             "name": "phpspec/prophecy",
-<<<<<<< HEAD
             "version": "v1.15.0",
             "source": {
                 "type": "git",
@@ -7512,18 +6040,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
                 "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-=======
-            "version": "1.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be1996ed8adc35c3fd795488a653f4b518be70ea",
-                "reference": "be1996ed8adc35c3fd795488a653f4b518be70ea",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -7575,15 +6091,9 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
             },
             "time": "2021-12-08T12:19:24+00:00"
-=======
-                "source": "https://github.com/phpspec/prophecy/tree/1.13.0"
-            },
-            "time": "2021-03-17T13:42:18+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -7664,7 +6174,6 @@
         },
         {
             "name": "phpunit/php-file-iterator",
-<<<<<<< HEAD
             "version": "2.0.5",
             "source": {
                 "type": "git",
@@ -7675,18 +6184,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
                 "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5",
-=======
-            "version": "3.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -7725,11 +6222,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5"
-=======
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -7737,11 +6230,7 @@
                     "type": "github"
                 }
             ],
-<<<<<<< HEAD
             "time": "2021-12-02T12:42:26+00:00"
-=======
-            "time": "2020-09-28T05:57:25+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "phpunit/php-invoker",
@@ -7922,7 +6411,6 @@
                     "type": "github"
                 }
             ],
-<<<<<<< HEAD
             "time": "2020-11-30T08:20:02+00:00"
         },
         {
@@ -7984,9 +6472,6 @@
             ],
             "abandoned": true,
             "time": "2021-07-26T12:15:06+00:00"
-=======
-            "time": "2020-10-26T13:16:10+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "phpunit/phpunit",
@@ -8520,7 +7005,6 @@
         },
         {
             "name": "sebastian/exporter",
-<<<<<<< HEAD
             "version": "3.1.4",
             "source": {
                 "type": "git",
@@ -8531,18 +7015,6 @@
                 "type": "zip",
                 "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
                 "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
-=======
-            "version": "4.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
                 "shasum": ""
             },
             "require": {
@@ -8551,11 +7023,7 @@
             },
             "require-dev": {
                 "ext-mbstring": "*",
-<<<<<<< HEAD
                 "phpunit/phpunit": "^8.5"
-=======
-                "phpunit/phpunit": "^9.3"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "type": "library",
             "extra": {
@@ -8602,11 +7070,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-<<<<<<< HEAD
                 "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4"
-=======
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             },
             "funding": [
                 {
@@ -8614,11 +7078,7 @@
                     "type": "github"
                 }
             ],
-<<<<<<< HEAD
             "time": "2021-11-11T13:51:24+00:00"
-=======
-            "time": "2020-09-28T05:24:23+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         },
         {
             "name": "sebastian/global-state",
@@ -9128,7 +7588,6 @@
                     "type": "github"
                 }
             ],
-<<<<<<< HEAD
             "time": "2021-07-28T10:34:58+00:00"
         },
         {
@@ -9188,9 +7647,6 @@
                 "source": "https://github.com/webmozarts/assert/tree/1.10.0"
             },
             "time": "2021-03-09T10:59:23+00:00"
-=======
-            "time": "2020-07-12T23:59:07+00:00"
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         }
     ],
     "aliases": [],
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 0cec9f8..d64a62c 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -156,11 +156,7 @@ function gtag(){dataLayer.push(arguments);}
 <!-- Footer -->
 <footer class="page-footer font-small">
     <!-- Copyright -->
-<<<<<<< HEAD
     <div class="footer-copyright text-center py-3">© 2023 Copyright:
-=======
-    <div class="footer-copyright text-center py-3">© 2021 Copyright:
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
         <a href="https://www.maxinero.com"> Maxinero.com</a>
     </div>
     <!-- Copyright -->
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 974388a..d3fe6a2 100644
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -127,11 +127,7 @@
     <!-- Footer -->
     <footer class="page-footer font-small">
         <!-- Copyright -->
-<<<<<<< HEAD
         <div class="footer-copyright text-center py-3">© 2022 Copyright:
-=======
-        <div class="footer-copyright text-center py-3">© 2021 Copyright:
->>>>>>> a4e216d7b7d05071d25a859d90a9a39d6e350b84
             <a href="https://www.maxinero.com">maxinero.com</a>
         </div>
         <!-- Copyright -->