Update composer.json

conflict issue...