fix(rebase): rebased master and migration

Identifier 'avatar_url' is not in camel case.<br>'fAuthData' is not defined.