typo
Merge branch 'master' of github.com:dancingbytes/gpb_merchant