Fix profile page
Fix auto merge
Merge pull request #29 from HuynhThan/feature/fix_profile_page

Feature/fix profile page