fix merge

Author: nicolas-grekas

composer.json

@@ -61,6 +61,7 @@
         "symfony/property-info": "^4.4|^5.0",
         "symfony/web-link": "^4.4|^5.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0",
+        "paragonie/sodium_compat": "^1.8",
         "twig/twig": "^2.10|^3.0"
     },
     "conflict": {