Fix a merge problem related to product bundle pricing