fix incorrect rebase

accidentally removed 6 commits