Photo: Instagram/kylizzlesnapchats

It appears that the feud between Kylie Jenner and Blac Chyna is finally over. However, going by what was posted on Kylie Jenner’s Snapchat, there may never have been a feud at all! And the timing could not have been better, as the two are poised to soon become in-laws. Here’s what we know about this new (old?) friendship following the end of the rumored rivalry.

On Thursday, April 22, Kylie Jenner took to Snapchat to post of a pic of her together with Blac Chyna, apparently just hanging out. But what was more interesting was the caption, which read, “When we’ve been best friends the whole time.” Neither star has commented on whether this means that they just did a great job of burying the hatchet or if the feud was just some sort of publicity stunt. Whatever the reason, they’re friends now and that’s what matters.

A photo posted by Kylie Jenner Snapchats (@kylizzlesnapchats) on

And in case you weren’t sure, yes, the feelings are apparently mutual. We know this because Blac Chyna’s Snapchat features a pic of the two with their faces swapped and another with a caption that reads, “Hanging out with my lil sis,” references how the two are (potentially) soon to be family.

Kylie in Blac Chyna’s snapchat (blacchynala)

A photo posted by Kylie Jenner Snapchats (@kylizzlesnapchats) on

The initial heat between the two stemmed from Kylie Jenner dating Blac Chyna’s ex-fiancee and baby-daddy, Tyga, leading to a harsh war of words on social media. Things got more complicated when Chyna, who is also the friend of Jenner’s stepsister Kim Kardashian, began dating Kim’s brother Rob.

The male Kardashian also recently proposed to Blac Chyna, who now sports a seven-carat diamond engagement ring, and, on Wednesday, bought the love of his life a Lamborghini as an advanced birthday present (her birthday is actually in three weeks). But it looks like the whole family can enjoy the car now, since Blac Chyna will now be more willing to give Kylie Jenner a ride!