merge defconfig