s1 changes after s2 had two pushed (reverse-merged from commit 6fbff3e80cc28b24eb915e1495527cedce3bb947)