merge Client And Server