Dwayne “The Rock” Johnson has reportedly ended his very public dispute with fellow “Fast and Furious” actor and producer Vin Diesel. The wrestling star turned actor has been airing his unhappiness with Diesel over social media in the six months, calling him a “candy ass.” In an Instagram post Johnson wrote thanking the cast and crew of the car racing franchise, Diesel was pointedly left out.

Their disagreements are believed to have been sparked over a fight for screen time and credit in the latest movie. “Being an alpha is sometimes a pain in the [butt].” Diesel recently told USA Today.

Arguing with a co-worker in public is typically a mistake, says Jacqueline Whitmore, etiquette expert and author of “Poised For Success.” “You should do it diplomatically and in private,” she advises.

But just after “The Fate of the Furious,” the franchise’s eighth installment, made a record $532 million at the global box office on the opening weekend, the two have buried the hatchet. Indeed, TMZ now says Johnson and Diesel will both star in the next installment of the series.

Diesel and Johnson are hardly the first celeb partners who’ve first publicly feuded and then made up. Just this past January, Chris Brown and Soulja Boy engaged in a social media battle after the latter posted a smiley face emoji on an Instagram photo of Brown’s ex-girlfriend. The two agreed on a pay-per-view fight in Las Vegas to settle the dispute, though they didn’t eventually get in the ring. Brown said that Soulja Boy had chickened out and that there were gangsters trying to profit off their bout.

Even if you’re not a Hollywood actor feuding with your co-star, there are practices everyone can take to end workplace disputes over credit. Whitmore, the etiquette expert, recommends having a conversation that avoids accusatory “you statements” that begin with “you did this” or “you did that.”

Instead, articulate your emotions candidly but non-dramatically. “Use statements that begin with “I feel” and explain how you feel equally responsible for the success of a project,” she says. “Ask if there’s a reason why you were left out and for yourself to be treated the way they’d want to be treated.”

When you think you might be working on a project in which someone else is vying for top billing, Whitmore recommends keeping track of your accomplishments so you can reference them in a dispute. “With facts and figures, you’ve got more to stand on,” she says. If the other party too has similar records, it makes it objectively easier to sort out the credit. “Typically when they’ve got statistics, you’ve got to back off. Actions speak louder than words.”

Sometimes, there’s nothing you can do but ask for a transfer to another department where you don’t have to deal with your co-worker nemesis. That’s especially if the other party has a caustic and difficult personality. But when the stakes are high—as they were with Diesel and the Rock—try being the bigger person and swallow your provide. “Etiquette is situational,” Whitmore says. “But the best thing you can do is try to get along.”