fixed the merge error