s1, s2

s2
edit s1,s2
add more to s1
Merge branch 'mid'