merge yars::client