Maybe it’s just me, but I was under the impression that our souls merged before the final fight. And that last scene with him walking with the other warriors of light was more of an artistic farewell to their characters.