Fixed the merge error.