updated composer.json
conflict merge
conflict merge