End 1
Delete README.md.orig
something
Merge branch 'test-branch'

Conflicts:
	README.md