updated composer.json
fixed composer.json
merged