The following contains spoilers for Walker Season 2, Episode 16, "Champagne Problems," which aired Thursday, May 5 on The CW.

Forgiveness and reconciliation are in the air as the Walker family commemorates the steadfast love between Bonham and Abby in style. A familiar face from Cassie Perez’s past resurfaces in Austin, leading her to address some unfinished business while Geri Broussard contemplates her place in the middle of the Walker-Davidson family feud. And while Cordell Walker himself means well, he’s about to endure some relationship drama of his own as he tries to give his parents a night to remember.

The Walker family celebrates Abby and Bonham’s 40th wedding anniversary, with an ambitious set of plans prepared to ring in the special occasion. Bonham shares with Walker that Abby is still visibly shaken since her falling out with Geri over the secret of her biological parentage, with Walker vowing to have the two make amends. This fortuitously coincides with Geri returning to town after spending time with the Davidson women, as she continues to navigate the sudden change to her familial dynamic.

RELATED: Arrow Star Kat McNamara Cast as Lead in The CW's Walker Prequel

While going out to buy alcohol for the evening’s festivities, Liam hits it off with the salesman only to discover that he is Cassie Perez’s estranged brother Ben, with the tension still evident between them. Liam advises Walker to not wade into the delicate matter and instead decides to help Cassie address the unresolved issues with her sibling, citing his own emotional rollercoaster of a dynamic with Walker. In the meantime, Walker meets up with Geri to make sure things are okay between them before imploring her to appear at his parents’ anniversary party. While still unsure of how she stands with Abby, Geri promises she will at least consider the invitation and opportunity for a reconciliation.

As Cassie tries to make amends with Ben, he is still furious with her for not being present for the death of his boyfriend Lucas back in Houston. Believing both their sons are busy, Bonham and Abby go with their grandchildren to the Side Step where they are greeted by a surprise party. Ben is present and continues his flirtatious rapport with Liam but still cannot bring himself to speak with Cassie. As Abby leads the party in a toast, she is happy to see Geri present, finally allowing herself to enjoy the proceedings.

RELATED: Walker: Jalen Thomas Brooks Hints at Season 2's Bigger Twists & Turns

Encouraged by Liam, Cassie works up the courage to speak with Ben privately, apologizing for months of ignoring her brother when he needed her the most, leading the siblings to tearfully mend fences. Stopping Liam from carrying out a toast, Bonham takes the opportunity to sing a song to the gathered party, reflecting his cowboy nature and his enduring relationship to Abby. Afterwards, Geri and Abby finally reconcile, with Geri reaffirming her love towards the Walker family as the two women embrace.

Returning to Ben’s home in Austin, Cassie thanks Liam for helping her make amends with her brother while giving him her blessing to potentially pursue a romance with him. After Cassie gives the men some space, Liam successfully asks Ben out before they enjoy a round of drinks. As Walker cleans up the party, he is approached by Twyla who thanks him for helping her out of trouble with her new boss who suspected her of defrauding him and for helping her secure an early parole. This leads to an awkward encounter with Geri mistakenly believing Walker is seeing Twyla behind her back, silently leaving without making her presence known to her friend.

Developed for television by Anna Fricke, Walker airs Thursdays at 8pm ET/PT on The CW.