new service management
updated merge