A dispute between New Zealand dairy and infant formula business A2 Milk and Australian food and beverage group Lion has been resolved without recourse to further legal action.