A new line
Merge branch 'Braching'

Conflicts:
	Hello.txt