new line of text
Merge branch 'new_branch'

Conflicts:
	text.txt