resolved conflicts for merge from mattrobenolt-hyperloglog