add some text from first branch
Merge remote-tracking branch 'origin/branch1'

Conflicts:
	text.txt