fix manual merge error