fix multiple definition of clone with upstream