In June, Nike and Nike Sport Swear came to blows over a dispute over a shoe line called Nike’s Signature Series, with Nike demanding that Nike cease using its trademarked logo for its tennis shoes. 

Nike Sportswears lawyers responded by filing a counterclaim against Nike that accused the company of violating trademark law. 

On Monday, Nike announced that it had settled the dispute, agreeing to pay $15 million in a settlement with Nike SportSwear. 

“Nike is pleased to resolve this dispute with Nike in a fair, nondiscriminatory and nondiscrimination-free manner,” the company said in a statement. 

In addition to settling, Nike also said that it would be taking steps to improve the way it handles complaints from consumers. 

A Nike spokesman told Business Insider that Nike had reached an agreement with Nike’s legal team to work together to ensure a “smooth and equitable” outcome. 

The Nike statement noted that “there is no evidence to indicate that Nike is engaged in conduct that is infringing on the trademark rights of Nike Sport.”

Nike did not immediately respond to a request for comment.