change from branch test-2
stale edit on master
Merge branch 'test-2'

Conflicts:
	test.txt
One more edit