In what has been the quickest turn around of celebrity drama maybe ever, Dwayne Johnson has now addresses his Fast 8 drama with a new, enlightened perspective.

After Johnson posted a status on Monday calling out his Fast 8 male co-stars as unprofessional “candy asses,” it was then revealed that Vin Diesel might be the source of the actor’s on-set beef. The two reportedly met on the film’s set on Tuesday night to work out their differences, and it looks like it worked, sorta. On Wednesday night Johnson posted a video to his Instagram with a long caption about the importance of team work and family. “To me, conflict can be a good thing, when it’s followed by great resolution.”

My FINAL WEEK of shooting #FastAndFurious. There's no greatness ever achieved alone.. it's always a team effort. We promised an epic prison break out for you guys and we delivered. HUGE THANK YOU to my ohana (family) stunt coordinator JJ Perry and his bad ass fearless stunt team - as well as my cousin and incredible stunt double @samoanstuntman. Thank you team for the willingness to "die hard" and drop your blood & sweat daily for our movie. #MyStuntBrothers #Loco4Life You guys reading this know how much I believe in the idea of TEAM EFFORT. 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. At the end of the day me and #F8 co-stars all agree on the most important thing: Delivering an incredible movie to the world. #Fast8 #IcemanCometh #FamilyGrowth

A video posted by therock (@therock) on

So did Johnson and his “candy ass” co-stars reach a resolution? The rest of the male cast is nowhere to be seen in the video, which shows Johnson chanting with the Fast 8 stunt coordinator J.J. Perry and stunt team. He added that he and his co-stars agreed that the most important thing is “delivering an incredible movie.” But maybe Johnson should’ve just quoted Dom in Furious 7, “I don’t have friends, I have family.” Too on the nose? Diesel also took to Instagram on Wednesday to share a video about family and discovering that his daughter learned a new word. Then he changed the subjected to dramatically add, “Just give me a second and I will tell you everything.” Huh? So is it him after all?

Enough family talk. JUST TELL US WHO THE CANDY ASS IS ALREADY! Fast 8 hits theaters April 14, 2017.