service.endpoint: fixing merge shit