Merging client & server