fix rebase fail