reindent parse.y
remove conflict