Fix Merge Comment in db.xml

Fix Merge Comment in db.xml file
Merge pull request #1290 from mkly/fix_merge_comment_in_file

Fix Merge Comment in db.xml