MADISON, Wis. (AP) — Court documents show a Wisconsin chocolate maker and the candy giant Mars Inc. have resolved a trademark dispute.

Mars sued Syovata Edari in federal court in Virginia claiming her Madison chocolate company, CocoVaa Chocolatier, infringed on Mars' CocoaVia brand of nutritional supplements. The case was thrown out by a judge in June because Edari doesn't sell any products in Virginia.

Edari sued Mars in federal court in July after learning that Mars was poised to sue again, this time in Wisconsin.

The Wisconsin State Journal reports that a one-sentence court filing Wednesday said the two sides had resolved their differences.

Edari says her company will continue to operate under the CocoVaa name. But, neither party wanted to talk about details of the settlement.