fix the merge error