fix ville defconfig getting messed up after last merge