fixed some merge error