fixed migrations
fixed imports