add order stockout
fix conflicts schema