added client
fixed merge conflict