fix some merge error