CVS, Walmart resolve spat over pharmacy benefit pricing