diff --git a/composer.lock b/composer.lock
index d6ba639..1e23b8b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1487,11 +1487,7 @@
         },
         {
             "name": "symfony/yaml",
-<<<<<<< HEAD
             "version": "v5.0.4",
-=======
-            "version": "v5.0.3",
->>>>>>> 60b1cca69588ba4af02246586f5e3c86eeeddd65
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",