Merging client and server