The ladies met up on Thursday (April 21) and posted selfies to their Snapchat accounts.
“So happy my girls finally got to talk and make peace! #MyFamily #AllLove,” Rob captioned one of the selfies on his Instagram account.
Chyna later started dating Rob and they recently got engaged. There have been tons of rumors of a feud, but it looks like things have been smoothed over!
Pictured inside: Chyna and her best friend Amber Rose stepping out together on Friday (April 22) in Beverly Hills, Calif.