fixing archaic merge