Fix conflict between type_alias_statement and primary_expression#319

vanessa-rodrigues wants to merge 6 commits intotree-sitter:mastertree-sitter/tree-sitter-python:masterfrom

vanessa-rodrigues:type_aliasvanessa-rodrigues/tree-sitter-python:type_aliasCopy head branch name to clipboard