new line in thisis.txt
Merge branch 'branch2'

Conflicts:
	thisistestbranch.txt