user integration with merchant pages
Merge branch 'user-upgrade'