deleted file
Merge branch 'new2'

Conflicts:
	test.txt