fixed all shift/reduce conflicts (no more nexpr)