These scenes reminded me of each other, not just because of the conflict resolution aspect (although it’s interesting to see when Callum holds that role and when Ezran, more often, does) and the framing, but mostly because of the way both times, Rayla looks to and ultimately follows Callum’s lead.
She was the one on the defensive in 2x02, but when Callum asks for his three very different friends to fold, she does so first largely at his behest. In 4x06 they’re stressed and bickering, but both back off when Ezran asks them to try to pull things together. And Rayla just looks at Callum and raises a brow. She knows the ball is still entirely in his court about how to handle their relationship because at this point, Rayla’s been expressing all her adoration in private and nothing regarding her own pain, and Callum hasn’t been approaching her either. But he hands his staff to her and starts thinking, literally moving to meet her halfway. It’s their first step to actually start repairing, in a lot of ways, and it’s lovely to see.