Affirming judgments following the jury convictions of two men for second degree murder and assault with a deadly weapon but concluding that senate bill changes applied retroactively to judgments not yet final and remanding for resentencing to allow the trial court to exercise its discretion to strike or dismiss the firearm enhancement.