singin user profile and fellow page
singin user profile, fellow page and merge conflict resolved