defconfig: fix merge derps