fix merge conflicts from upstream
add phone authentication when calling jailbird
fix merge conflicts
fix merge conflicts when merging phone_authentication