1234 on master
5678 on s1
Merge branch 's1'

Conflicts:
	test4.txt