multiple conflicts resolved in composer.json