One of the biggest beefs in Hollywood briefly returned to the spotlight at Sunday’s Golden Globes. While presenting at the ceremony, Vin Diesel looked out into the audience and said “Hey, Dwayne” as the camera cut to Dwayne “The Rock” Johnson, who appeared to be awkwardly smiling at the greeting.

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.