Fixed lingering merge issue.