database stuff
fixed merges