Fix error in rebase