fixed composer.json
merged