working on database
merge with shloka