After Kardashian's sister Kylie Jenner and his fiancée Chyna sent fans into a frenzy yesterday by oh-so-casually Snapchatting together – and claiming they'd actually been "best friends the whole time" – it appears that Chyna and Kardashian's famous family have buried the hatchet and put the bad blood behind them. (In case you aren't caught up, the model/business owner has a long and tense history with the family because she was previously engaged to and shares a son with Kylie's current boyfriend, Tyga.)
"So happy my girls finally got to talk and make peace!" he captioned a mirror selfie of Chyna, 27, and Jenner, 18, from Thursday. "#MyFamily #AllLove."
Sources previously told PEOPLE Kardashian and Chyna's engagement caused friction amongst Kardashian's family, and despite the friendly Snapchats between Jenner and Chyna, the Kardashian-Jenner women have not yet publicly acknowledged the news.
"Khloé [Kardashian] and Kylie think Chyna is desperate, thirsty and playing with Rob's head," a source previously told PEOPLE. "They're also concerned she is after his money and that she is dying to stay relevant and get back at Kylie by being with Rob."
Kardashian and Chyna, meanwhile, have been on cloud nine since the formerly reclusive reality star popped the question with a 7-carat diamond ring.
"She was more than excited, she was thrilled, just super happy," a rep for Chyna previously told PEOPLE of the engagement, also revealing the star plans on going by her birth name, which is Angela White: "She's soon to be Angela Kardashian. She's ecstatic."