fixes things that returned to old status during merge.