add user profile
fixed conflicts