fix manual merge goof