first
second
third
Merge branch 'hotfix' with master

Conflicts:
	text1.txt