Fixed an unresolved merge issue.