Revert "merged migrations"

This reverts commit 1422903f9db9f330b800143b14b6dd436698611c.