some broken migrations removed
Merge branch

I happen to see broken migrations and fixed it on my end