Story 3.6c: branch: master.rebase, m1