On Sunday night, Taylor Swift (opens in new tab) and Amy Poehler (opens in new tab) took the stage together to present the award for Best Animated Feature at the 77th annual Golden Globe Awards ceremony. Although neither of them spoke publicly about it, this lovely moment seemed to be a not-so-subtle sign that the drama of their past was behind them.

A little background: the awkwardness between Swift and Poehler dates back to the 2013 Golden Globe Awards, which Poehler co-hosted with longtime friend and Saturday Night Live co-star Tina Fey (opens in new tab). During the show, Poehler and Fey got a few laughs at the expense of Swift (opens in new tab), joking about staying away from Michael J. Fox's son.

The joke was obviously referring to the public perception at the time that Swift was quick to make boyfriends. Polar and Fey (open in new tab) thought they were having fun with this joke (the Golden Globes are known as a time to roast celebrities, and while Polar and Fey were hosting, Swift was not the only target of the joke), Swift was after the show, made it clear that he did not appreciate this bit.

"There's a special place in hell for women who don't help other women," Swift famously said in response to the jab in an interview with Vanity Fair (open in new tab) shortly after the 2013 Golden Globe Awards.

After Swift's comments to Vanity Fair went viral, Poehler responded by explaining that she and Fey never intended to upset the young singer.

"I'm sorry if she was upset. I'm a feminist and she's a young, talented girl," Poehler told The Hollywood Reporter (opens in new tab). 'Having said that, I agree that I would go to hell. But for other reasons. Mostly about boring taxes.

Swift seems to have accepted the olive branch to shade through her media about the joke-at least, if the photo of her and Poehler happily presenting together at the 2020 Golden Globe Awards (opens in new tab) is any indication

We officially pronounce this "feud" dead.

To read more stories like this, including celebrity news, beauty and fashion advice, savvy political commentary, and fascinating features, sign up for the Marie Claire newsletter.

Sign up here [19].