modified config files
merged