modified migrations
merge fix for migrations