second commit, now with third commit rebased in