Remove conflicts from composer.json