merge
working on db