changed first line
changed first line on branch
Merge branch 'testbranch'

Conflicts:
	branchfile.txt