your
Add new sentence.
Merge branch 'new_branch'

Conflicts:
	README.md
Merge branch 'new_branch2'

Conflicts:
	README.md
Oh no
Merge branch 'master' into new_branch

Conflicts:
	README.md