services: fix up conflict