Merge client and server