Rebasing gone wrong