diff --git a/composer.json b/composer.json index 2cd48e43660f..3073e4b6f130 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,9 @@ "illuminate/support": "self.version", "illuminate/translation": "self.version", "illuminate/validation": "self.version", - "illuminate/view": "self.version", + "illuminate/view": "self.version" + }, + "conflict": { "tightenco/collect": "<5.5.33" }, "require-dev": { diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json index 1d9d2f46de24..42931b1c30a5 100644 --- a/src/Illuminate/Support/composer.json +++ b/src/Illuminate/Support/composer.json @@ -20,7 +20,7 @@ "illuminate/contracts": "5.6.*", "nesbot/carbon": "^1.20" }, - "replace": { + "conflict": { "tightenco/collect": "<5.5.33" }, "autoload": {