rebase: fix rebase after merge