fix unmerged file
fix db names