merged db fix