fix migrations
Merge branch 'fix_migrations'