buy to storage area finished
conflict fix