6
7
merge

Conflicts:
	1.txt