>>280672520
It's likely a mix of both moments, the scene's initial shot is identical to the one in episode 24, but their clothes are from the kiss scene