fix a small rebase fail