moved service to conflictServbice