Fixed conflict in composer.json