update stockout
edit comflict