Again, looks like a merge issue.  I'll fix.