anotherfile.txt
Merge branch 'pr/4'

Conflicts:
	anotherfile.txt