Vin Diesel and Dwayne ‘The Rock’ Johnson

Diesel and Johnson have had a long-documented feud that seems to have started in 2016 when The Rock complained about his male co-stars on the eighth The Fast and Furious movie, calling them, including Diesel, “candy a–es.”

“My female co-stars are always amazing and I love ’em. My male co-stars however are a different story,” he wrote in a since deleted post. “Some conduct themselves as stand up men and true professionals, while others don’t. The ones that don’t are too chickens— to do anything about it anyway. Candy a–es.”

There was a lot more drama that happened that Insider aptly breaks down — but you should know that as of June 1, Johnson declared the feud over.

“”Last summer, @vindiesel and I put all the past behind us,” Johnson wrote on Instagram. “We’ll lead with brotherhood and resolve – and always take care of the franchise, characters & FANS that we love.”