Fixed composer.json merge issue