add self join to stock_log
add self join merge conf