Glad Abby finally got to whip on Caroline, although as you mentioned, they were pretty evenly matched.

I don't think anything could make Abby forgive Caroline for her actions but Caroline's concern about Rex at the end is probably the only thaw in Abby's feelings about her.

The end at the funeral with Abby and Connor walking away is interesting, as it now seems that Connor is the one rejecting Abby's advance at comfort. He might not have noticed it, or maybe he saw and avoided her deliberately. Whatever the case, it caused even more of a distance between the two characters, physically and emotionally.