updated composer.json
merged