diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 31de2b7449..f36c2d647c 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -24,7 +24,6 @@
     "require-dev": {
         "symfony/stopwatch": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
-<<<<<<< HEAD
         "symfony/form": "~3.4|~4.0",
         "symfony/http-kernel": "~3.4|~4.0",
         "symfony/property-access": "~3.4|~4.0",
@@ -34,17 +33,6 @@
         "symfony/expression-language": "~3.4|~4.0",
         "symfony/validator": "~3.4|~4.0",
         "symfony/translation": "~3.4|~4.0",
-=======
-        "symfony/form": "^3.3.10|~4.0",
-        "symfony/http-kernel": "~2.8|~3.0|~4.0",
-        "symfony/property-access": "~2.8|~3.0|~4.0",
-        "symfony/property-info": "~2.8|3.0|~4.0",
-        "symfony/proxy-manager-bridge": "~2.8|~3.0|~4.0",
-        "symfony/security": "^2.8.31|^3.3.13|~4.0",
-        "symfony/expression-language": "~2.8|~3.0|~4.0",
-        "symfony/validator": "^3.2.5|~4.0",
-        "symfony/translation": "~2.8|~3.0|~4.0",
->>>>>>> 3.4
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": "~2.4",
         "doctrine/orm": "^2.4.5"