member and user merge working
Merge pull request #11 from goravbhootra/merge_member_and_user

member and user merge working