Fix merge PriceEstimation