merging with server