fixed the merge errors cause by duplication