defconfig merge glitch