edit stock
conflict resolved