diff --git a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
index 4c9520b759..425bd8d04c 100644
--- a/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
+++ b/src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
@@ -30,14 +30,6 @@
             "/Tests/"
         ]
     },
-<<<<<<< HEAD:src/Symfony/Component/Mailer/Bridge/Amazon/composer.json
     "minimum-stability": "dev",
-<<<<<<< HEAD
     "version": "5.1-dev"
-=======
-    "version": "4.4-dev"
-=======
-    "version": "3.4-dev"
->>>>>>> 3.4:src/Symfony/Component/ClassLoader/composer.json
->>>>>>> 4.4
 }
diff --git a/src/Symfony/Component/Notifier/composer.json b/src/Symfony/Component/Notifier/composer.json
index 4dc20aa390..65de5d3c61 100644
--- a/src/Symfony/Component/Notifier/composer.json
+++ b/src/Symfony/Component/Notifier/composer.json
@@ -29,9 +29,5 @@
         ]
     },
     "minimum-stability": "dev",
-<<<<<<< HEAD:src/Symfony/Component/Notifier/composer.json
     "version": "5.1-dev"
-=======
-    "version": "4.4-dev"
->>>>>>> 4.4:src/Symfony/Component/Debug/composer.json
 }