fix the rebase fallout