Committing something that will conflict
Merge origin/master

Conflicts:
	README.md