It seems that Fast and Furious star Vin Diesel is going out of his way to establish that he and Dwayne Johnson have finally squashed their beef. The two first locked horns in August 2016 when the Rock addressed one of his co-stars with certain offensive adjectives.

Amid a détente in the years-long tension between the action stars (a feud that played out across Instagram and in press interviews), the actors shared an awkward on-air moment.