update peg-grammar
fix merge conflict