my fault, missed it in fixing a merge conflict