add the client_merge