Resolved conflicts for Begall's db fixes