Was I the only that didn’t realize this was all the same person?

The samurai that wins the duel at the beginning of the episode, wearing the yellow, can be seen later at Madame Kaji’s. Once getting spanked, and again in a private room with 2 others.

Mizu seemed impressed with his skills at first, making the comment about the immaculate painter’s signature. She shows disgust the second time we see him. By the third time, I think she is so overwhelmed she doesn’t know what to think. “That is a swordsman that knows the shape of his soul”

(Also I would love to know how y’all get nice screenshots, sorry for the image quality)