Update conflict to reflect tree-sitter-c initializer_list change
Update conflict to reflect tree-sitter-c initializer_list change

tree-sitter/tree-sitter-cpp,tree-sitter/tree-sitter-cpp,tree-sitter/tree-sitter-cpp,tree-sitter/tree-sitter-cpp,tree-sitter/tree-sitter-cpp,tree-sitter/tree-sitter-cpp