merger uses general classes now; prov information is updated