product update add merge and shop return type fix
Merge branch 'master' of https://github.com/anubhawps/shuttersup