6
Merge branch 's1'

Conflicts:
	file2.txt