modifying user profile page
fixed merge conflict on user.html page