update - Makefile and Kconfig conflict