Refactor edit merchant code
Merge branch 'master' of https://github.com/mgeronimo/CTG-Apply