git rebase --continue
merge three parts into one