Conflicts:
	composer.json
	composer.lock
	config/global.php
	core/Container/StaticContainer.php