Canada and New Zealand resolve dairy trade dispute, Canada says