sql db added
merge conflict fixed