third set of UMBC merges; still all inert changes