fix merge

Author: nicolas-grekas

composer.json

@@ -47,7 +47,7 @@
         "doctrine/collections": "~1.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.13.1|^3.0",
-        "doctrine/orm": "^2.7.4"
+        "doctrine/orm": "^2.7.4",
         "psr/log": "^1|^2|^3"
     },
     "conflict": {