solve conflict problem
change for stock