minor db alterations (globals)
merge resolution
merge resolution