changed max price
fixed merge conflict