shift/reduce conflicts resolved