update the stock graph
conflict fix