db changes
fixed merge
a typo