merging migration file merge conflict
Merge branch 'dev' of https://github.com/davidyuan1989/nova into dev