fix merge error in changed task