Canada | China, Canada resolve canola-shipping dispute; to boost trade ties