Update composer.json conflict