fix conflict on composer.json