resolve merge conflict from TS-2089
LogObject.h doesn't need to #include SimpleTokenizer.h