Merge from server