Solved all reduce/reduce conflicts

Still have 5 shift/reduce conflicts (3 need to be solved)