Changes to config files
Fix merge conflicts