6
Merge Conflicts:
	test.txt