Fixed db due to merge conflict