update consts
manual merge