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.

Vin Diesel has given an update, of sorts, following his awkward shoutout to his longtime frenemy Dwayne "The Rock" Johnson at the Golden Globes on Sunday. And if anyone was concerned about the state of affairs between the two alpha males, it seems that everything is A-OK; for now, at least.