[TMo] fixed the merge conflict