Conflicts:
	.gitignore
	composer.json