This should give you a conflict
Merge branch 'test' of https://github.com/stucki/test into stucki-test

Conflicts:
	README.md