Conflicts:
	vendor/autoload.php
	vendor/composer/InstalledVersions.php
	vendor/composer/autoload_files.php
	vendor/composer/autoload_real.php
	vendor/composer/autoload_static.php
	vendor/composer/installed.json
	vendor/composer/installed.php