fix compile error cause by merge error