add user device id, add user profile picture
merge code