fix merge

Author: nicolas-grekas

composer.json

@@ -23,7 +23,7 @@
         "symfony/asset": "~3.4|~4.0",
         "symfony/dependency-injection": "~3.4|~4.0",
         "symfony/finder": "~3.4|~4.0",
-        "symfony/form": "^4.1.11|^4.2.3",
+        "symfony/form": "~4.1.11|^4.2.3",
         "symfony/http-foundation": "~3.4|~4.0",
         "symfony/http-kernel": "~3.4|~4.0",
         "symfony/polyfill-intl-icu": "~1.0",
@@ -41,7 +41,7 @@
         "symfony/workflow": "~3.4|~4.0"
     },
     "conflict": {
-        "symfony/form": "<4.1.2",
+        "symfony/form": "<4.1.11|<4.2.3,>=4.2.0",
         "symfony/console": "<3.4"
     },
     "suggest": {