Pricing method ready
Mergeg conflicts solved