Return child organizations in APIv1
Fix conflicts