Resolve merge conflicts
Fixes to database build scripts