June 28, 2016 1:10 PM EDT

In the never-ending saga that is Kardashian family dynamics, it seems that the drama between the future Angela Kardashian (neé Blac Chyna, a.k.a. the mother of the one true Kardashian heir) and her soon-to-be-in-laws has magically dissolved — or so their respective Instagrams would have us believe.

The Kardashian krew gathered for Khloe’s birthday Monday night, where they faithfully documented their chummy antics with Blac Chyna and Rob Kardashian; ironically, this show of familial bliss comes after the most recent airing of an episode where the Kardashian sisters put Rob and Chyna on blast for getting engaged. But no matter — the Kardashians and Blac Chyna are one big happy family now and they have the Instagrams to prove it.

To wit:

Blac Chyna calls Kris Jenner, “mama” — now that Blac and Rob have their own E! show, momager Kris has obviously welcomed them to her empire.

Nothing shows family solidarity like a game of air hockey!

Photo booths are also a great way to quell drama and rumors.

Even Khloe, one of the biggest critics of ChyRob, cozied up to the couple at her party.


Write to Cady Lang at cady.lang@timemagazine.com.

Read More From TIME

Related Stories