fixing one more merge issue
fixing one more merge issue

pazaan/chrome-uploader,tidepool-org/chrome-uploader,tidepool-org/chrome-uploader,pazaan/chrome-uploader,pazaan/chrome-uploader,tidepool-org/chrome-uploader