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.

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.