defconfig: fiz merge derps