I don't think the git rebase worked