merge conflict, fixes RPC to not send sockets