add HTTPS, add merchant update