Kim Kardashian and Stephanie Shepherd, better known to fans as Steph Shep, appear to have let bygones be bygones.

The “Keeping Up With the Kardashians” star and her former assistant reunited at Kourtney Kardashian’s 39th birthday party Thursday night, where they posed for photos and videos together on Kim’s Snapchat and Instagram stories.

In one video, Kim leaned on Steph as they both shouted “Woo Kourtney!”

On an episode of her E! reality show, Kim expressed that she worried Steph had grown too socially close to Kourtney, prior to making the decision to cut Steph loose after she gave an eye-opening interview to Refinery29 about working for the Kardashians.

Steph became Kim’s executive assistant in 2013 and her role grew to include managing Kim Kardashian-branded products, including Kimoji and associated merchandise.

Clearly, there’s no awkwardness here, as they had no problem celebrating at Kourtney’s party, where guests also included Kanye West, Larsa Pippen, Kris Jenner, Kendall Jenner and Malika and Khadijah Haqq. The celebration featured cone hats, a unicorn rainbow cake and terrifying piñatas that were meant to look like the guests.