In the world of celebrity feuds (and there are a LOT to keep track of), Kylie Jenner and Blac Chyna’s has been sort of iconic.

After Kylie started dating Chyna’s ex Tyga, we didn’t think things could get much worse – that was, until, Chyna started dating Rob Kardashian. AKA Kylie’s brother.

YES, they’re more complicated than your average family tree, but now that Rob and Chyna are engaged, it seems the stars have put their drama behind them – and what better way to do so than with a sneaky Snapchat session?

Posing for a selfie together, Kylie sent fans into a freak out, writing: “When we’ve been friends the whole time…”

And while we’re sure that’s not totally true, it looks like the two really are on good terms now.

Because seriously, what says ‘BFFs’ better than a terrifying face swap?

Kylie also made a cameo in Chyna’s Snapchat, as she captioned another fierce picture of them: “Hanging out with my lil sis”.

Well, they certainly know how to go from 0-100 real quick.