~ isBuildable fix
merge conf