Conor McGregor’s relationship with the UFC may be undergoing repairs.

According to FOX Sports, “Notorious” met with UFC owners Lorenzo Fertitta and President Dana White in an attempt to resolve the tension created by McGregor’s removal from his scheduled rematch with Nate Diaz at UFC 200 on July 9 in Las  Vegas.

The UFC pulled McGregor from the card due to the featherweight champion’s refusal to do promotional work attached to the main event. Several hours prior to to the promotion announcing the main event bout had been scrapped, McGregor unleashed his MMA world-tilting retirement announcement on Twitter.

The back-and-forth between the UFC and McGregor made solid drama, but Wednesday’s meeting is another sign that both sides are cooling off.

“I met with Dana and Mr. Fertitta—good conversation, like it always is,” McGregor told ESPN on Thursday. “We have a good relationship. It is what it is. It happens. This is the fight game. Sometimes emotions get into it, but it’s important to recognize that emotions have no place in business.

“So that’s essentially what it was last night. We just set it aside. We are doing beautiful things, so let’s continue. Let’s fix it and continue.”

While the UFC and McGregor may be back on talking terms, it’s difficult to believe things will ever return to the full-throttled love fest the Irishman enjoyed before the shake up. It was “The Conor McGregor Show,” and Zuffa used their promotional machine to push the his profile to unprecedented heights for a fighter not named Ronda Rousey.

Nevertheless, following his loss to Diaz at UFC 196, McGregor believed his focus should be put on training rather than skipping around the globe. The UFC countered by scratching him from the card.

Whether their relationship will ever be fully repaired remains to be seen, but McGregor believes progress is being made.

“I’d say we’re nice and in the middle,” McGregor said. “In a good place.”