Fix small merge issue.