redundant confs removed
Merge pull request #172 from prongs/merge_db

redundant confs removed