fixing db method
merging