Fixed after-rebase fail