Dwayne “The Rock” Johnson and Vin Diesel have had many ups and downs through the years as part of their infamous feud, which reportedly began while the two were costarring in the eighth installment of the Fast and Furious franchise.

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.