fixed migration
Merge branch 'backend'