Fixed typo
Embeded pos info in syntax.t
Fixed conflict