fixing failed merge, part II