Fix merge issue.