5
Merge branch 's1'
delete
Merge branch 's1'

Conflicts:
	file2.txt
delete
Merge branch 's1'
1
Merge branch 'master' into s1