PHOTO | Conor McGregor and Nate Diaz teams squash their beef

It looks like the beef between Team McGregor and Team Diaz has been squashed after the two went to war and put on a “Fight of the Night” show for fans.

A brawl nearly broke out at the UFC 196 press conference ahead of the weigh-ins after Conor McGregor punched Nate Diaz’s hand away from his face as the two went head to head at the end of the presser.

The trash talk extended to members of the team as McGregor and training partner of Diaz, Jake Shields shared some words.

When it was all said and done, some members from the opposing camps let their guards down for a moment to celebrate after UFC 196. Shields and head coach of McGregor John Kavanagh posed together in a photo that Kavanagh posted on twitter.

Kavanagh captioned the post, “Fight to the death then share the secrets #TrueMartialArts @jakeshieldsajj”

Love it! RT @John_Kavanagh Fight to the death then share the secrets #TrueMartialArts @jakeshieldsajj pic.twitter.com/QSI63aYWgG

— Karyn Bryant (@KarynBryant) March 6, 2016