fix rebase errors