update rpc calls
resolve merge conflicts