Update service
resolved conflicts