Creating conflict, do I?
Merge branch 'gitInConflict'

Conflicts:
	README.md

...