profile page updates
Merging changes
Fixed merge conflicts