All sweet: Bitter dispute between sugar miller and marketer finally ends