add test text 2

Conflicts:
	folder/test1.txt