Merge conflict resolution fail, nice catch. Fixed.