fix(rebase): rebased master and migration

Identifier 'u_id' is not in camel case.<br>Mixed double and single quotes.