update composer.json
Merge branch 'update-composer-json'