Merge client & Server