merged db branch changes