bug fix
confrict removed
fixing stock location process