update order by price
fix conflicts