added profile page update login
fixed merge conflicts