delete
test6
Merge branch 'Master-Merge-Test' 2

Conflicts:
	test5.txt