Dana White and Demetrious Johnson have been at odds ever since the UFC president announced that he was trying to pit the flyweight champion against TJ Dillashaw.

White’s announcement came on the back of Cody Garbrandt withdrawing from his bantamweight championship date with Dillashaw due to a back injury.

Known as a loyal company man to the UFC, Johnson uncharacteristically spoke out against the promotion’s attempts to book him in a bout with Dillashaw on an episode of The MMA Hour that was broadcast in June.

Towards the end of the month, White claimed that Johnson would face the man he was initially supposed to meet, Ray Borg.

According to Johnson’s manager, Malki Kawa, the UFC president and ‘Mighty Mouse’ resolved their issues at a meeting over the weekend at UFC 214.

“It went great…it went well,” Kawa told Ariel Helwani on the latest episode of The MMA Hour.

“DJ fights on Sept. 9 against Ray Borg, he’ll break the (UFC title defense) record and then we’ll move onto something else and try to get him into some big fights.

“We’re going to make the right moves for DJ and help DJ reach the goals that he wants to reach”

Kawa stated “misunderstanding and miscommunication” led to the public back and forth between White and Johnson, but after the meeting, they have “buried the hatchet”.

“Yeah, they buried the hatchet,” he said. “Dana told DJ how he felt about some stuff and DJ told Dana how he felt about some stuff. They buried the hatchet.

“There was a lot of misunderstanding and miscommunication. There were are a lot of different parties involved, I thought I would bring the two of them together and get this thing right.

“It worked well. I’m expecting this to work out in DJ’s favor in the long run. I think he will be very happy and I think UFC will be very happy with him.”

Kawa also suggested that Johnson could look to negotiate a new contract if he is successful in his upcoming clash with Borg.

“After the fight we’ll see, we’ll sit down and talk. The truth is that there are a lot of things involved, it’s not just a matter of us getting a new contract.

“DJ’s got some fights left on his contract now and there are a lot of things we need to work through.

“I think we need to win this fight and then we’ll be able to sit down and talk to somebody. Like I said, it’s big to get them back talking together.”