merge client to server