clean up errors from rebase