Canada wins latest dairy battle but war lingers