Basic user profile page
fixed conflicts