Khloe Kardashian celebrated her 34th birthday yesterday in L.A., with all her sisters and her baby-daddy Tristan Thompson in attendance. Khloe was showered with gifts and social media tributes all day long - but, the best present of all was Kim Kardashian and Tristan Thompson agreeing to reconcile after their very public beef.

Back in May, Kim addressed Tristan's cheating on Ellen, saying what he did to Khloe was "so f*cked up." After that, Tristan immediately blocked Kim on Instagram, and they've had bad blood ever since. 

In front of her 113 million Instagram followers, Kim asked Tristan - "Alright guys what do you think, it's Khloe's birthday. Do you think I should ask this guy to unblock me? For Khloe's birthday will you please unblock me?"

Kim pointed the camera at Tristan, who was sitting next to her on the couch at Khloe's birthday party. Khloe appeared into the frame and pointed at Tristan, who started to laugh at the question.

Via @kimkardashian

 "It's only right. I got you," Tristan said. Kim persisted, asking him "Was that a yes?" to which Tristan gave two thumbs up. Khloe chimed in saying, "Do it right now!"

"Wait, what's your code? Khloe..." Kim asked as she leaned over Tristan's shoulder, "She knows it," Tristan said right away. Looking at his phone, Kim realized that Tristan also blocked Khloe's best friends Malika and Khadijah Haqq after the cheating scandal went public.

Via @kimkardashian

'There's no going back," Kim said as Tristan unblocked her, "Now the question is, should I follow you again?" In the end, Kim decided to take the high road and followed Tristan back. 

We're glad to see that, after everything Tristan's put Khloe through these last few months, her sisters are willing to leave the drama in the past.