Cleanup rebase errors