Court documents show a Wisconsin chocolate maker and the candy giant Mars Inc. have resolved a trademark dispute.