Fixed the merge issue.