fixing db merge issue
Merge pull request #82 from RTakes/master

fixing db merge issue