Fixed a merge conflict issue.