Merged Config Files.

Merged config files. No real changes were made