A price dispute between Britvic and UK retailer Sainsbury's over the supply of Pepsi-Cola has now been resolved, the soft drinks firm has confirmed.