Adds Goku as a partner
Fixes the conflict
adds Chandler Bing as partner
fixes