fix rebase issues