add user info and restaurant api call
fix merge conflict