test6
Merge branch 'test1'

Conflicts:
	test.txt