Migrate database
Resolve merge conflict