I think it's them becoming friends again after she moved out. It's been a while since I've seen those episodes.
Ugh Stella! As much as I loathe her in a way she did bring them closer together
and you are right there was tons of foreshadowing that season. I do wish they would have had a talk about their argument at his wedding. They never mentioned it again
