updated db to reflect column
merge conflict resolved