Merge proposals

kconfig in Ubuntu has no merge proposals.