Never mind my last comment, I was viewing it on my phone and didn't quite catch the context.  Yes, bad merge.  My bad.  I'm on the road today and may not be able to fix it until tomorrow evening.

Good catch!