working with user profile page
Fixed conflicts