update composer.json
resolved merge conflict