With Taylor Swift and Kanye West in the same room for the 2015 Grammy Awards last Sunday, viewers have expected an awkward encounter between the two musicians.

Of course, Ye made everyone a bit nervous again that night when he stepped up on stage as soon as Beck received his Album of the Year Award for "Morning Phase." Beck's win gave the "99 Problems" rapper the best opportunity to make the biggest awkward joke of the night.

Jay Z thought it was hilarious after a split-second moment of panic.

The joke, of course, was in reference to the infamous incident during the 2009 MTV Video Music Awards when the 37-year-old rap star interrupted Swift's acceptance speech for her Best Video win over Beyonce.

Thankfully, last Sunday's musical even at the Staples Center finally put to rest any lingering feud between the "Shake If Off" singer and Nori's father.

The pair was photographed greeting each other with smiles and hugs according to the Huffington Post. They even posed for a group shot with Jay Z and West's wife, Kim Kardashian.

Browse through the gallery to see Taylor Swift and Kanye West making up at the 2015 Grammy Awards!