initial merge of client and server