fix typo
Merge all the config file files