PRH and Waterstones resolve dispute and return to 'business as usual'