fix rebase issue