Services: Fix conflicts