Remove db from repo
refactor migrations
merged conflicts