There weren't. This looks more like a merge conflict hiccup.