Fixed merge issue.