fix incorrect merge - do not continue to split in the old style
fix incorrect merge - do not continue to split in the old style

inbloom/secure-data-service,inbloom/secure-data-service,inbloom/secure-data-service,inbloom/secure-data-service,inbloom/secure-data-service