Bad merge of Kconfig