Ruxi: update client.
Fixed conflict.