updates to config files
merge