user profile page
fixed merge issue