merged new config