merge client-server