2
6
7
4
merge

Conflicts:
	1.txt