Merge server and client