add line
Merge branch 'test' into branch-1

Conflicts:
	test.txt