fix merge

Author: nicolas-grekas

composer.json

@@ -41,6 +41,7 @@
         "symfony/form": "^4.3|^5.0",
         "symfony/expression-language": "^3.4|^4.0|^5.0",
         "symfony/http-client": "^4.3|^5.0",
+        "symfony/lock": "^4.4|^5.0",
         "symfony/mailer": "^4.3|^5.0",
         "symfony/messenger": "^4.3|^5.0",
         "symfony/mime": "^4.3|^5.0",
@@ -57,7 +58,6 @@
         "symfony/workflow": "^4.3|^5.0",
         "symfony/yaml": "^3.4|^4.0|^5.0",
         "symfony/property-info": "^3.4|^4.0|^5.0",
-        "symfony/lock": "^4.4|^5.0",
         "symfony/web-link": "^3.4|^4.0|^5.0",
         "doctrine/annotations": "~1.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0",