Tensions thaw slightly as China resumes imports of Canadian beef, pork