Fix menuconfig
Fix more merge errors and typos