Fix rebase fail