fixed migrations
merge with master
fixed build error