add another-branch-file
add some text
add some more text
create a conflict?
Set up for a resolvable conflict
Oooh, you can edit right on gh...

... so I'm testing that
Merge branch 'another-branch'

PR #4

Conflicts:
	some-branch-file