Extend ESF typechecker for the merge case
Extend ESF typechecker for the merge case

hkuplg/fcore,zhiyuanshi/fcore,xnning/fcore,xnning/fcore,wxzh/fcore,wxzh/fcore,zhiyuanshi/fcore,wxzh/fcore,zhiyuanshi/fcore,bixuanzju/fcore,hkuplg/fcore,bixuanzju/fcore,xnning/fcore,hkuplg/fcore,bixuanzju/fcore