Remove rebase errors