change on branch master
change on branch old, parallel with change on branch master
Merge branch 'old'

Conflicts:
	README.md
commit 2 parents