fix(rebase): rebased master and migration

Line is too long.