by qianjun;fix merge bug