Conflicts: include/chaiscript/language/chaiscript_common.hpp include/chaiscript/language/chaiscript_parser.hpp