Merge ProxyClient and ServerClient.