Branch
Another branch
Another line
Merge branch 'master' into Braching

Conflicts:
	Hello.txt