Add product table
Fix conflict
Edit merchant database and controller
Merge branch 'master' of https://github.com/gumarusveritrans/ragnarok