lagadi DB tengingar
merge conflict resolved