Robby and Sam Relationship Resolutions

Does anybody else think Robby and Sam should've had a resolution in Season 5. As they got from conflict to resolved in s4 to s5.

Their relationship is different to Miguel and Tory, as the 2 were friends beforehand, and their relationship affected johnny and Daniels beef personally.

It would have been nice to see more friendly moments in s5 and 6, as she's Robbts only non family related friend imo.