Over the past month or so, UFC Welterweight Champion Tyron Woodley and Dana White have been trading shots with one another. It all started over the situation of Woodley possibly facing Nate Diaz in his next fight.

Both Woodley and Diaz thought they were going to fight against one another, but the UFC President shut these talks down and said that the Welterweight Champion was “full of sh-t”, statements which The Chosen One claimed were “very damaging” to him.

However, a new development has occurred in the beef between Woodley and White. It's coming to an end.

During a recent appearance on TMZ Sports for his own segment “The Hollywood Beatdown”, Woodley took the chance to finally end his rift with White, saying that he's 'squashing everything' in order to focus on getting himself healthy enough to fight once more.

Woodley said: "I’m squashing everything. I’m focusing on getting the shoulder together. One-by-one, everybody will get these hands. I don’t know the order. I don’t know who’s next. But I never wanted to bounce around and not continue to defend my belt. I’ve been here for a while and I plan on knocking everybody out.

“I’m going to take a woosa. So if you people want to know about the Dana beef, about the Frankenstein beef, about the Queefington beef, I don’t want to talk about it. I’m focusing on being successful.”

Hopefully now Woodley will keep to his word and focus on stepping inside the Octagon again once he is fully recovered. Fingers crossed as well White is able to return the favour and book the UFC Welterweight Champion in a title defense that everyone will enjoy later this year.

The Chosen One hasn't fought for UFC since he successfully defended his UFC Welterweight title at UFC 214 last year in July when he defeated Demian Maia. He's been undefeated in his last six fights, as he hasn't lost since he faced Rory MacDonald at UFC 174 in June 2014.