They probably made two different films with all the reshoots they did.
Well, if you look at Kylo’s death closely, it seems to have been shot in reverse AND he says something before he lays down/gets up.
I suspect Kylo lived in at least one or two shoots.