add merged data config
Merge pull request #30 from ottomao/master

Auto merge by kpm server