Fix problem where merge wouldn't add new clients