Branch 1: Change 1
Branch 1: Change 2
Merge branch 'master' into branch-1

Conflicts:
	readme.md
Merge branch 'branch-1'