starting stock distribution to services
fixing conflict
fixing conflict