error introduced on a rebase