Where I'm from, there is no bro-on-bro dispute that can't be settled with hot wings and cold beer.
When that fails, a simple "Hey bro, sorry about that" will usually suffice -- it's just not as fun. Either way, UFC on FOX analyst Kenny Florian was able to kiss and make up with UFC bantamweight champion Dominick Cruz, after "The Dominator" took a swipe at "KenFlo" during his UFC Fight Night 81 victory lap.
"I talked to Dominick and he apologized to me. He said his emotions were running high and I get it.