On Sunday night, Lady Gaga attended Madonna’s Oscars afterparty.

After years of back and forth feuding starting in 2012 when Madonna said “Born This Way” reminded her of her 1989 hit “Express Yourself” and called Lady Gaga “reductive.”

In case you need a reminder of the history of the feud, Pop Sugar laid it all out here

In the end though, there may have been 100 people in the room on Sunday,  but all eyes were on these two when Time snapped a photo of them embracing with Gaga’s Oscar.

 

View this post on Instagram

 

The 91st Academy Awards were filled with historic firsts and emotional moments, from @blackpanther‘s Ruth E. Carter and Hannah Beachler becoming the first black women to win in their respective categories (Costume Design and Production Design) to @ladygaga and Bradley Cooper’s stirring performance of their award-winning song “Shallow.” After the event, the biggest names in #Hollywood celebrated at “The Party,” entertainment mogul @guyoseary and @madonna’s famed after-party, where there is a strict ban on social media posts. TIME partnered at the event with the artist and photographer JR—a 2018 #TIME100 honoree—for an exclusive look at last night’s winners and partygoers. See more pictures at the link in bio. Photograph by @jr for TIME

A post shared by TIME (@time) on Feb 25, 2019 at 5:10am PST