Remove shift/reduce conflicts