LAS VEGAS — Floyd Mayweather Jr. and Marcos Maidana have shifted their focus back to boxing after a glove controversy on Friday threatened their fight tonight at the MGM Grand in Las Vegas.

"It's all worked out. The two camps worked it out," said Golden Boy CEO Richard Schaefer. "Mayweather is fighting in Grants and Maidana is fighting in Everlast. That's all that I've been told, and the fight is on."

Maidana's Everlast eight-ounce gloves were found to have lacked the appropriate amount of padding around the knuckle area, according to Schaefer, but those gloves have since been replaced.

Mayweather's attorney, John Hornewer, said in a report on thesweetscience.com that Maidana's gloves were suspected of being "back loaded" around the wrist area in addition to not having enough padding at the crest of the fist.

Mayweather Promotions CEO Leonard Ellerbe also objected to the distribution of the padding as well as the "integrity of the packaging" of the equipment, which was shrink-wrapped.

Francisco Aguilar, chairman of the Nevada State Athletic Commission, expressed relief.

"I'm not sure of the details, but there was a resolution, and that's all that I needed to know," said Aguilar, adding that he was informed by Schaefer. "That was about an hour ago. I'm ready for today."