Yes it's a bad merge. I'll fix that.