New default config and fixing merge errors