fix(rebase): rebased master and migration

'app' is not defined.