fixed shift/reduce conflicts