s1
s1
s2
Merge branch 's1' into develop
s2
Merge branch 's2' into develop

Conflicts:
	first_develop_file.txt