fix(rebase): rebased master and migration

Expected '{' and instead saw 'return'.