Tennis star Rafael Nadal had a dispute with umpire Carlos Bernardes back in February. It appears the two have made complete amends as the Associated Press reports that Nadal has requested the ATP to not assign the umpire to his matches for the time being.

The dispute dates back to a match held in Brazil when Nadal improperly put his shorts on and asked Bernardes for some time to do a quick change up. Bernardes responded saying Nadal would receive a time warning for it.

"For me, that's not fair," Nadal said, adding that while he maintains respect from the umpire, it would "better for both of us if we are not (on a) court at the same time for a while."

According to the AP report, ATP spokesperson Simon Higson wrote in an email, "Requests such as this are not uncommon, either from the player or the umpire." The French tennis federation, which handles chair umpire assignments at the French Open, for its part, said that Nadal has made no request to them to avoid Bernardes, but that the two's tense relationship is common knowledge.

Fellow tennis star Novak Djokovic was asked to comment on the situation. "There are some chair umpires in some matches that I remember that I wasn't very happy with how they did their job, but I never thought of requesting a chair umpire not to ever - or whatever, for a certain time - be a chair umpire in my matches. I don't think that's fair. I don't think that's fair to them. You know, they do their job as best they can. Of course sometimes, they do it better or worse," the Serbian said.

Nadal kicked off his quest for a 10th French Open title Tuesday with a straight sets victory over 18-year-old Quentin Halys.