Merging from server