add stock_log
merage with master