add server and client
merge