basic db functions
fixed merge conflict