Fix single site WP-CLI index; remove debug code
Resolve conflics