rpc client
fix conflict