fixed profile page
merge conflict