Merge server with client