Configuration merge