US3061: resolved conflict for index.html
US3061: resolved conflict for index.html

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