update grammar definition
fix conflict