Confidential settlement ends testy milk dispute