service distribution continuing
fixing conflict