fix an apparently failed merge