The Court of Appeal vacated appellant’s sentence, and remanded the matter for a full resentencing consistent with Assembly Bill 518, which now affords trial courts the discretion to choose the count on which to impose punishment, and other sentencing laws effective January 1, 2022, including Senate Bill 567 and Assembly Bill 124.