# Conflicts:
#	CHANGELOG.md
#	composer.json
#	src/Illuminate/Cache/FailoverStore.php
#	src/Illuminate/Collections/Collection.php
#	src/Illuminate/Collections/Enumerable.php
#	src/Illuminate/Collections/composer.json
#	src/Illuminate/Container/composer.json
#	src/Illuminate/Database/composer.json
#	src/Illuminate/Foundation/Application.php
#	src/Illuminate/Http/Middleware/PrefersJsonResponses.php
#	src/Illuminate/Http/composer.json
#	src/Illuminate/Queue/Worker.php
#	src/Illuminate/Routing/composer.json
#	src/Illuminate/Support/Facades/Notification.php
#	src/Illuminate/Support/Facades/Request.php
#	src/Illuminate/Support/composer.json
#	tests/Console/Scheduling/ScheduleTest.php
#	tests/Integration/Database/DatabaseLockTest.php
#	types/Support/Collection.php
#	types/Support/LazyCollection.php