Added config files
merged.