something went wrong when I rebased