fix manual merge screwup