defconfig: fix merge derp