By Derek Lawrence
August 10, 2016 at 11:25 PM EDT
Giles Keyte

Things got pretty furious on social media earlier this week, when Dwayne Johnson called some of his Fast 8 male costars “candy asses.” In a new Instagram video, the Rock is hinting that the family feud has found a “great resolution.”

On Wednesday, Johnson posted a video thanking the stunt team that has helped him deliver what he says will be the “prison scene of all prison scenes” — and to vaguely reference the conflict going on with the mega-franchise.

“You guys reading this know how much I believe in the idea of TEAM EFFORT,” he wrote in the caption. “That means respecting every person, their time and their value when they step on to my set or partner with our production company. And like with any team – that’s a family – there’s gonna be conflict. Family is gonna have differences of opinion and fundamental core beliefs. To me, conflict can be a good thing, when its followed by great resolution. I was raised on healthy conflict and welcome it. And like any family, we get better from it.”

On Monday, Johnson praised his female costars but criticized the men, writing, “Some conduct themselves as stand up men and true professionals, while others don’t. The ones that don’t are too chicken s-‑‑ to do anything about it anyway. Candy asses. When you watch this movie next April and it seems like I’m not acting in some of these scenes and my blood is legit boiling — you’re right.”

It was reported this week that the specific “candy ass” referenced by Johnson was costar Vin Diesel. In a now deleted Instagram post, fellow Fast 8 star Tyrese claimed that Johnson’s beef wasn’t with him and wrote, “DJ happens to be one of the most humble, down to earth and professional people I’ve ever worked with.”

Fast 8, which also stars Michelle Rodriguez, Chris “Ludacris” Bridges, Jason Statham, Kurt Russell, Charlize Theron, Helen Mirren, and Scott Eastwood, crashes into theaters on April 14.