All’s well that ends well for Rob Kardashian and Blac Chyna.

The two spent New Year’s Eve together and appear to be closer than ever following a turbulent past few weeks; Rob was hospitalized briefly for diabetes complications Wednesday night, more than a week after he and Chyna got into a big fight and aired their drama on social media.

The two rang in 2017 at a New Year’s Eve dinner, in what marked Rob’s first public appearance since his health scare.

Chyna wore a white plunging halter top gown with a sheer, fishnet-style sparkling skirt and long platinum blond wig, while Rob sported a black top. Chyna shared on Snapchat a video of them blowing into blow horns at a table containing dishes of shrimp cocktail and strawberries.

Happy New Years woohoo ! Hope y’all have a great New Years and be safe ! Ciaooooo

A video posted by ROBERT KARDASHIAN (@robkardashian) on