fix service overlap across repos