Merge with client site