correct error introduced by rebase