Looks like all of that drama is behind them! After years of feuding, Caitlyn Jenner and her ex-wife Kris Jenner are finally in a good place. On Tuesday, November 5, the former athlete took to Instagram to share a special birthday message with the Keeping Up With the Kardashians matriarch.

“Happy birthday to this special woman!” Caitlyn wrote. “What an amazing mother and businesswoman you are. Love you! 🎈 🎂” Accompanying the words was a photo of the two women out to dinner looking as gorgeous as ever — and daughter Kylie Jenner couldn’t have been happier to see the post. In the comments, she left a string of pink heart emojis. 

One week earlier, Caitlyn celebrated her own birthday, but Kris didn’t seem to reach out — at least not publicly. That didn’t stop some of the Kardashians from helping celebrate the big 7-0. On October 30, the I Am Cait author revealed that some of her children and step-children joined her for a nice dinner out. “Such a special birthday dinner with family,” she captioned a photo featuring Kourtney and Kim Kardashian as well as Brandon, Kendall and Kylie Jenner. “Love you all.”

However, Kris and Cait did reunite in May. When Kylie hosted a launch party for her skincare line, both of her parents were in attendance. Though it appears the women didn’t pose for a photo together — and the Olympian did bring girlfriend Sophia Hutchins along — they managed to keep the peace.

But just one month later, some of the exes’ dirty laundry was put on display during an episode of the family’s E! TV show. When Kim invited her former stepfather to the family Christmas party, it sparked an argument between the Kardashian sisters. “What about mom’s peace?” Khloé Kardashian wanted to know. “We don’t want our mom to be uncomfortable at her own party and yes, it is mom’s party. She created it.”

The famous momager wasn’t about to let the drama spoil their holiday, though. She put an end to the argument by insisting that she and her ex would manage to both survive in a room together. “I promise you, I’m fine,” she insisted. “Just let it go. Vodka’s my friend.”

Have a tip? Send it to us! Email In Touch at contact@intouchweekly.com.