getting ready for merge db