fix kconfig merge derp