fix prices
merge